Legacy tests now passing.

FossilOrigin-Name: f33526a341132435cb4185149a784eef6b3a1a2d

diff --git a/manifest b/manifest
index bfca64b0a8c94b4935e1f6eef51f945f2c503532..a7725c09a7bab0fd3e410bad42159a3852a1e586 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C First\scut\sat\simplementing\sthe\snew\ssqlite3_trace_v2()\sinterface.
-D 2016-07-13T22:55:01.845
+C Legacy\stests\snow\spassing.
+D 2016-07-13T23:18:27.653
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -348,7 +348,7 @@ F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 F src/loadext.c 4237fd37ca589f1d90b3ea925dd9df20da8e0c84
-F src/main.c 05658dfa4be5704e4d6542fe0f2452be5b9df09e
+F src/main.c a3be9a816c72fe658838e33e42afabfff93526f2
 F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@ -448,7 +448,7 @@ F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
-F src/vacuum.c 459ff7cb3c589451111ff2d3b6eb31be83a46a54
+F src/vacuum.c 544ec90a66a4b0460b7c1baeadbc21b45e6ca0b6
 F src/vdbe.c c6bb62aa69a6faf1197eee36336c6de99bb4733f
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
@@ -1505,7 +1505,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0c569f759f6c4701321d7fea5e7ccb371743bb6b
-R eeeb6e6908fe861e59edc045bbf20a73
+P cb0062feb018f52689938a58cb76886d431c33f0
+R d7e93f0729616f164eba3e9e1862aa07
 U drh
-Z 1f8408ee484498502acfe0ea8cf0fbae
+Z a0be5e80cc5b797f562ce4c096d88be2

diff --git a/manifest.uuid b/manifest.uuid
index 7db259389700deb1f41925d24c8d7fef2c0416cf..5103610b4fac68dbbf1a5667d039d3e2631950f8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb0062feb018f52689938a58cb76886d431c33f0
\ No newline at end of file
+f33526a341132435cb4185149a784eef6b3a1a2d
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index d2f8bf7996a19b9ac097989c43cab21c5d8fedfb..5969738f6b3c3a304429824829981c3a82b9095e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1816,7 +1816,7 @@ void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), void *pArg){
 #endif
   sqlite3_mutex_enter(db->mutex);
   pOld = db->pTraceArg;
-  db->mTrace = SQLITE_TRACE_LEGACY;
+  db->mTrace = xTrace ? SQLITE_TRACE_LEGACY : 0;
   db->xTrace = (int(*)(u32,void*,void*,i64))xTrace;
   db->pTraceArg = pArg;
   sqlite3_mutex_leave(db->mutex);

diff --git a/src/vacuum.c b/src/vacuum.c
index 93b438fb1a11b9ae9b16ebdf0508c213d4852648..9ab7f766eeb32bbbab47f82135e1bd4c56d1020f 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -145,7 +145,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
   saved_mTrace = db->mTrace;
   db->flags |= SQLITE_WriteSchema | SQLITE_IgnoreChecks | SQLITE_PreferBuiltin;
   db->flags &= ~(SQLITE_ForeignKeys | SQLITE_ReverseOrder);
-  db->xTrace = 0;
+  db->mTrace = 0;
 
   pMain = db->aDb[0].pBt;
   isMemDb = sqlite3PagerIsMemdb(sqlite3BtreePager(pMain));