diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
| commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
| tree | 6a637dd4dde653f870346a37ec6555eb0574949a /src/test1.c | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'src/test1.c')
| -rw-r--r-- | src/test1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test1.c b/src/test1.c index 6849b5c..c3dac06 100644 --- a/src/test1.c +++ b/src/test1.c @@ -5928,7 +5928,7 @@ static int optimization_control( sqlite3 *db; const char *zOpt; int onoff; - int mask; + int mask = 0; static const struct { const char *zOptName; int mask; @@ -6287,6 +6287,8 @@ int Sqlitetest1_Init(Tcl_Interp *interp){ (char*)&sqlite_static_bind_nbyte, TCL_LINK_INT); Tcl_LinkVar(interp, "sqlite_temp_directory", (char*)&sqlite3_temp_directory, TCL_LINK_STRING); + Tcl_LinkVar(interp, "sqlite_data_directory", + (char*)&sqlite3_data_directory, TCL_LINK_STRING); Tcl_LinkVar(interp, "bitmask_size", (char*)&bitmask_size, TCL_LINK_INT|TCL_LINK_READ_ONLY); Tcl_LinkVar(interp, "sqlite_sync_count", |