Back out part of the change in [23ea2b700fd6d28d] since TH3 reveals some

problems in OOM situations.

FossilOrigin-Name: 15d215d62df72c1bf1e605629692ee40d96546a6

diff --git a/manifest b/manifest
index fee20bc559314e9cc58d8259e0958fe3ed0a010f..e4b28f7c928a8bec907bd566a24b7472f42d0844 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Use\sthe\ssqlite3CtypeMap[]\sto\simprove\sthe\sspeed\sand\sreduce\sthe\ssize\sof\sthe\s\nlogic\sin\sthe\stokenizer\sthat\srecognizes\sidentifiers.
-D 2009-11-16T15:11:51
+C Back\sout\spart\sof\sthe\schange\sin\s[23ea2b700fd6d28d]\ssince\sTH3\sreveals\ssome\nproblems\sin\sOOM\ssituations.
+D 2009-11-16T21:28:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -214,7 +214,7 @@ F src/vdbe.c 0bc1c3aaa0c5c13240c2e39ce3b9ae92586fc30b
 F src/vdbe.h 5f35750615163d1064052785b4a9f0eb004a720d
 F src/vdbeInt.h d7ea821ac7813c9bea0fe87558c35e07b2c7c44d
 F src/vdbeapi.c 17680ab7a75ec938c5ba039a6c87489d01faf2cb
-F src/vdbeaux.c 52ea13c94a9370ec450bf94895cbfcf6476c68ea
+F src/vdbeaux.c 0981dcb5b933b74ae7bc9bfa7770df5e4da849b3
 F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
 F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
 F src/vtab.c 456fc226614569f0e46f216e33265bea268bd917
@@ -771,14 +771,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 23ea2b700fd6d28d3b13663d164faba3760c572e
-R ff7dc9a29a110ca6fe2ef1d043fe89c6
+P 1c9243b0760741f48b15efb0da661255177aed8b
+R 2a3aeb21f4a3bbfe7cfca935b177d6e0
 U drh
-Z 2e37b081548a523067185a6c35da2ce6
+Z 9c2b416f8f787b6f334bf09d3499d0a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLAWu6oxKgR168RlERAhhMAJ9xxAEwnp2tWr1WgM5s7IPqbk0mbACfVgc7
-rdtspkVXXpzbnF9p6xeNkdw=
-=/XvC
+iD8DBQFLAcQQoxKgR168RlERAs/sAJ9LLCrNdB5gT6NALFZz9zKR408UXQCfQ3la
+6skLmIYJc1m0uPoQURk432Y=
+=7uKK
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index d541cc5da712d8ae0d8dd170efd6a790c339a531..8baca8ef55ac30a70781a95691a8cdc79eb133a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c9243b0760741f48b15efb0da661255177aed8b
\ No newline at end of file
+15d215d62df72c1bf1e605629692ee40d96546a6
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 09542dfa03fd2b3887b557fae976f73947d3197f..063508603cd0c512b8c5f6b8eb0f59b6eebeaf5e 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2786,7 +2786,7 @@ int sqlite3VdbeRecordCompare(
 
   pKeyInfo = pPKey2->pKeyInfo;
   mem1.enc = pKeyInfo->enc;
-  mem1.db = 0;
+  mem1.db = pKeyInfo->db;
   /* mem1.flags = 0;  // Will be initialized by sqlite3VdbeSerialGet() */
   VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */