From: drh <drh@noemail.net>
Date: Fri, 16 Oct 2009 16:21:51 +0000 (+0000)
Subject: Merge the sqlite3_reoptimize() changes into the trunk.
X-Git-Tag: fts3-refactor~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebecd2c97035d69cf43c4c0dc8564789aa9be0ba;p=thirdparty%2Fsqlite.git

Merge the sqlite3_reoptimize() changes into the trunk.

FossilOrigin-Name: 50136840d54674c239613265ebbacaabf215f4e2
---

ebecd2c97035d69cf43c4c0dc8564789aa9be0ba
diff --cc manifest
index eb0caec175,f4d4019e4a,2c69aa7e21..a7d88c866c
--- a/manifest
+++ b/manifest
@@@@ -1,8 -1,5 -1,5 +1,8 @@@@
 - C Remove\sa\smutex\sreference\sleak\sfrom\ssqlite3_reoptimize().
 - D 2009-10-16T15:19:08
  -C Fix\sa\sproblem\sin\sthe\sanalyze3.test\sscript.
  -D 2009-10-16T15:59:35
 ++-----BEGIN PGP SIGNED MESSAGE-----
 ++Hash: SHA1
 ++
-  C Comment\scleanup\sin\sbtree.c.
-  D 2009-10-16T15:05:19
+++C Merge\sthe\ssqlite3_reoptimize()\schanges\sinto\sthe\strunk.
+++D 2009-10-16T16:21:52
   F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
   F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
   F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@@ -208,17 -205,17 -205,17 +208,17 @@@@ F src/trigger.c 2053afa9952f69cf451bc0e
   F src/update.c 2c8a64237e4fae604468d14380b877d169545b63
   F src/utf.c 99cf927eabb104621ba889ac0dd075fc1657ad30
   F src/util.c 59d4e9456bf1fe581f415a783fa0cee6115c8f35
 --F src/vacuum.c 869d08eaab64e2a4eaf4ef9ea34b851892b65a75
 --F src/vdbe.c a03993ed188c9b2c575766dfe2b8cdc9f0bd2262
 ++F src/vacuum.c f2347520907ee4ec867c9b804d24456b0fd912a7
-  F src/vdbe.c b00293fa34fe0e065610f355fd95988fa357068a
-  F src/vdbe.h 7d5075e3fa4e5587a9be8d5e503857c825490cef
-  F src/vdbeInt.h 7afb76c0296f9a2310e565803fa66798ef47e9d5
-  F src/vdbeapi.c 524d79eb17bbcbe31c37c908b8e01edc5c684a90
-  F src/vdbeaux.c 6834737c119f5662c9e6d147ddb4f72523a31aea
+++F src/vdbe.c f0d6e7dbd4515758c188c9dd7025eb9dfcf021e0
+  F src/vdbe.h 1fb725c38df7f79dc60e9a61cb368152d9457e3c
+  F src/vdbeInt.h aafda2e9761298e12ef0a3e8b5caed9aaf9c7592
+  F src/vdbeapi.c a7669f434f1fb53457343e7e85d06d695f7bb4e8
+  F src/vdbeaux.c bd26b3c765dff7c0bc089f550d82510a37f24d6a
   F src/vdbeblob.c 9bfaeab22e261a6a7b6df04e7faaf7d6dfdbef5a
-  F src/vdbemem.c 0ff2b209fccade3ff6709286057b82ed7f6c1e70
+  F src/vdbemem.c 7055a2941a7802094f4704cedc7a28cc88a23749
   F src/vtab.c 3e54fe39374e5feb8b174de32a90e7a21966025d
   F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
-  F src/where.c 53e2620985fc691b62e811cb25c46cd6f4dd7f77
+  F src/where.c 10b4796d864701376054cd5aad1c71c87cb76bd9
   F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
   F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
   F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@@@ -229,6 -226,7 -226,7 +229,7 @@@@ F test/alter4.test 9386ffd1e9c7245f43ec
   F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
   F test/analyze.test ad5329098fe4de4a96852231d53e3e9e6283ad4b
   F test/analyze2.test a2ad7b0a4e13801ee3968fe70f22aff52326569c
 - F test/analyze3.test 030efdbb019e0246b43ff0040559ab8da2cd1d35
++ F test/analyze3.test 2f00779be9c1637dd72793de755a17722995d836
   F test/async.test 8c75d31b8330f8b70cf2571b014d4476a063efdb
   F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
   F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
@@@@ -761,14 -758,7 -758,7 +762,14 @@@@ F tool/speedtest2.tcl ee2149167303ba8e9
   F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
   F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
   F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-  P 174477bca05d019e663fd2b7cd031189ab2e010a
-  R 86490e3083ac0bc0fd081f22ec541c2a
 - P 9bd6f3d8864d422fe42074688b191915b27ad8ea
 - R 723564f2f75d771b2a25fc5af0a983d9
  -P 9f0937066184421f23453ceb451fd726c75cb593
  -R 86e25f1b6a52bb9c63882796d734f555
 --U dan
 - Z 39d2326c736939285f79811bc830d90e
  -Z fec49abff05b5e5ceea062664695ce9e
+++P 32966ba4796e70d0afcff6abdda9bdcba08b098a 9f0937066184421f23453ceb451fd726c75cb593 61174aea74db59f6792e275aa366b7f0e1f2270b
+++R 61972980031ca23020de60e9d0fbe40d
 ++U drh
-  Z b17767b2b8f9c8009e027786b6c3af45
+++Z 1bd496ba22406bf1b4185ebae8272187
 ++-----BEGIN PGP SIGNATURE-----
 ++Version: GnuPG v1.4.6 (GNU/Linux)
 ++
-  iD8DBQFK2IuyoxKgR168RlERAtgCAJ98+WY1Pr2TifLYL6T7GXUUzCZi6wCfVaBD
-  oWFTM8wlOhaD8eBE8rtZdkU=
-  =6Cef
+++iD8DBQFK2J2moxKgR168RlERAnBlAJ0TOp4dztyQ8x3H8zZLjMwtg9ofCQCeM/sa
+++FdOVdtjuYXVkiT+lGN/mPWo=
+++=+vEN
 ++-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 5c2e9174b1,9b2eb8ebea,2cb4922954..96ecc2564e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@@ -1,1 -1,1 -1,1 +1,1 @@@@
-  32966ba4796e70d0afcff6abdda9bdcba08b098a
 - 9f0937066184421f23453ceb451fd726c75cb593
  -61174aea74db59f6792e275aa366b7f0e1f2270b
+++50136840d54674c239613265ebbacaabf215f4e2