Fix a bug introduced by (5519) causing builds with SQLITE_OMIT_VIRTUALTABLE to malfun...

FossilOrigin-Name: 761e73ceab77f965d58546ecf493f65cf52456fc

diff --git a/manifest b/manifest
index f78f10959b1e4e9e9b86ffea1b541fbcfb9dbf61..3a456339bcf7997609702f9156f22ca2e3154355 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sref-count\son\sthe\ssqlite3_vtab\sstructure\sbefore\scalling\seither\sthe\sxNext\sor\sxFilter\smethods.\s(CVS\s5524)
-D 2008-08-02T15:10:09
+C Fix\sa\sbug\sintroduced\sby\s(5519)\scausing\sbuilds\swith\sSQLITE_OMIT_VIRTUALTABLE\sto\smalfunction.\s(CVS\s5525)
+D 2008-08-02T15:32:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -146,7 +146,7 @@ F src/select.c 23106fd9a9618a832abaf5dc906c79dc21755edc
 F src/shell.c 4b835fe734304ac22a3385868cd3790c1e4f7aa1
 F src/sqlite.h.in 30af3a002a0b672aaae8f4a5deb0a2e9a4b699af
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
-F src/sqliteInt.h 4c3a19206bacfab8650f2616bc0004c1dea7fbf3
+F src/sqliteInt.h 8bd67fa1beb4eb67f9c543f1f27bd454bbca9fb4
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 8ad1f215934c5f5afb91df86e44dccff7ef3c1d0
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P f1e44eb323f05495cbae25113aebcc50d16b40df
-R 4025f2f9c936b96cf13e66989019ddc4
+P 6e41455f2c7ee57c60578541040631b899e1481f
+R 64bcb91d2e65178562a0c2ac681cf755
 U danielk1977
-Z 390cd1c9dbb285f76023a2fbf1f44c44
+Z 4436b1d6c098cf208dd2f40f4e63d6d7

diff --git a/manifest.uuid b/manifest.uuid
index 917346ef83b43ff090eb4f1d4a66e8fba848bacb..85085cff9852948283f02e0d15f0c1af129a22df 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e41455f2c7ee57c60578541040631b899e1481f
\ No newline at end of file
+761e73ceab77f965d58546ecf493f65cf52456fc
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 36fa811a4c3587643ef11c996ff210f2cf55a185..6897671a04066d1228b383a6e4d39edea33062d1 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.750 2008/08/02 03:50:39 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.751 2008/08/02 15:32:40 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2261,7 +2261,7 @@ int sqlite3AutoLoadExtensions(sqlite3*);
 
 #ifdef SQLITE_OMIT_VIRTUALTABLE
 #  define sqlite3VtabClear(X)
-#  define sqlite3VtabSync(X,Y) (Y)
+#  define sqlite3VtabSync(X,Y) SQLITE_OK
 #  define sqlite3VtabRollback(X)
 #  define sqlite3VtabCommit(X)
 #else