Change the VDBE to export the sqlite3MemCompare() routine and thus free

where.c from the dependency on vdbeInt.h.

FossilOrigin-Name: d186d1ac3c47f0d814636c4b8386a6065a294750

diff --git a/manifest b/manifest
index fc497fbfa94b2c5494245f3205ef9a2e43d322f1..620657f6c1d0be3a38e600006130c98f9c80856b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sfixes\sfrom\strunk\swith\sthis\sbranch.
-D 2014-06-28T14:25:32.570
+C Change\sthe\sVDBE\sto\sexport\sthe\ssqlite3MemCompare()\sroutine\sand\sthus\sfree\nwhere.c\sfrom\sthe\sdependency\son\svdbeInt.h.
+D 2014-06-28T14:28:06.405
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -284,8 +284,8 @@ F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
 F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
-F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
-F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
+F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
+F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
 F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
@@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c fea270aeef23f978edac94b5591c74b0bf3ce884
+F src/where.c 1f448161f1d9ec8cb68e2a8eb2e4a9756a877f69
 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1182,7 +1182,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 219736f54dcd1448af3400e699f1c20755ac6876 fb32e374b75b160e7b535e732ced6c34dbb513eb
-R 638c04374a356a745d9c2d2f0fa602ad
-U dan
-Z fc19d5103e4b8e0f744c9b3dd9fc467e
+P 6af219d1b83ec54b3fb4ad4e6216d9ad9ea0fc70
+R 0d122ee9efb300dc8d78b79e592143bf
+U drh
+Z 93fe23c37a7fe2b9652da5b4873aa7c3

diff --git a/manifest.uuid b/manifest.uuid
index bcfbef832540bdfc1ee7caa008faa107a0114046..172499a5478a13f8a0211117c8aa8412b6e895e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6af219d1b83ec54b3fb4ad4e6216d9ad9ea0fc70
\ No newline at end of file
+d186d1ac3c47f0d814636c4b8386a6065a294750
\ No newline at end of file

diff --git a/src/vdbe.h b/src/vdbe.h
index 10a4140ee11e1012e5c976e39fd9adf1773e9ae3..ef91010d8083b4f35942c529b78f4b6646ddad83 100644 (file)
--- a/src/vdbe.h
+++ b/src/vdbe.h
@@ -209,6 +209,7 @@ void sqlite3VdbeSetVarmask(Vdbe*, int);
 #ifndef SQLITE_OMIT_TRACE
   char *sqlite3VdbeExpandSql(Vdbe*, const char*);
 #endif
+int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*);
 
 void sqlite3VdbeRecordUnpack(KeyInfo*,int,const void*,UnpackedRecord*);
 int sqlite3VdbeRecordCompare(int,const void*,UnpackedRecord*,int);

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 043b56da59b0fa36dea74617b4cae83bec2d348c..d629802a647ae53f9ae2cadc9eddeff215d6f63b 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -394,7 +394,6 @@ void sqlite3VdbeDeleteAuxData(Vdbe*, int, int);
 int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *);
 int sqlite3VdbeIdxKeyCompare(VdbeCursor*,UnpackedRecord*,int*);
 int sqlite3VdbeIdxRowid(sqlite3*, BtCursor *, i64 *);
-int sqlite3MemCompare(const Mem*, const Mem*, const CollSeq*);
 int sqlite3VdbeExec(Vdbe*);
 int sqlite3VdbeList(Vdbe*);
 int sqlite3VdbeHalt(Vdbe*);

diff --git a/src/where.c b/src/where.c
index 3cd566c46b98235fc8b540bfc1efe7ab2f5ef2a9..e431e9413efffaf2312b364b00eacc15bdbe992b 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -18,7 +18,6 @@
 */
 #include "sqliteInt.h"
 #include "whereInt.h"
-#include "vdbeInt.h"
 
 /*
 ** Return the estimated number of output rows from a WHERE clause