Remove extra instances of the text "checked out." from sqlite.h.in. Also add new...

FossilOrigin-Name: 9897da22c5b51611597350efbe8d5dcaf39d748b

diff --git a/manifest b/manifest
index ca3ae0504260350e87a28b4cead5e039cf95aab2..cbbcf9e1566546af60385c5e845860df03cc0c87 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sbuilds\swith\sSQLITE_OMIT_WAL\sdefined\sto\sfail.
-D 2011-02-01T18:00:43.271
+C Remove\sextra\sinstances\sof\sthe\stext\s"checked\sout."\sfrom\ssqlite.h.in.\sAlso\sadd\snew\sfile\sfts3_aux.c\sto\smksqlite3c.tcl.
+D 2011-02-01T18:59:34.035
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
 F src/shell.c 83c6f0cc5a79a081c7b9ddfe4f557b47e0bad976
-F src/sqlite.h.in 76955fcd1c5371268ecc8afe0ce6c49ea750ae38
+F src/sqlite.h.in 7599c4975cd0d0fff8d8d8cd3e423ca893b48f47
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 45926deaf59b1ce3f55d21d5f91a8cecb6a7eb4c
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -877,7 +877,7 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
-F tool/mksqlite3c.tcl e0db70c2c52b0e3d0867ca931229e5b90ffe7837
+F tool/mksqlite3c.tcl cf44512a48112b1ba09590548660a5a6877afdb3
 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
@@ -900,7 +900,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4ade96ce974244fc34bb97713d3cba10e3d33056
-R cf616bd9d5d6b4778f7580e251dfc563
+P b9b48dd8ddceec009b5a22a3699e1524542c004a
+R 622aceea1d56ea439d2ecbf642323605
 U dan
-Z c6308069adad7ddbe7a456bda546fcf0
+Z a779252ff2db0dcc3441f04cdb450265

diff --git a/manifest.uuid b/manifest.uuid
index c5ada4842904c404c6c381bb21db02d4197b7a1a..76424ad79e3f93026732a8172e03527ffe6495c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9b48dd8ddceec009b5a22a3699e1524542c004a
\ No newline at end of file
+9897da22c5b51611597350efbe8d5dcaf39d748b
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index eb9774638588f83c2c1cad17f715e64470e54680..3ee1aa93233991c61a7f109a17e874c590399231 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5534,24 +5534,21 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
 ** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
 ** <dd>This parameter returns the number malloc attempts that were 
 ** satisfied using lookaside memory. Only the high-water value is meaningful;
-** the current value is always zero.
-** checked out.</dd>)^
+** the current value is always zero.)^
 **
 ** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
 ** <dd>This parameter returns the number malloc attempts that might have
 ** been satisfied using lookaside memory but failed due to the amount of
 ** memory requested being larger than the lookaside slot size.
 ** Only the high-water value is meaningful;
-** the current value is always zero.
-** checked out.</dd>)^
+** the current value is always zero.)^
 **
 ** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
 ** <dd>This parameter returns the number malloc attempts that might have
 ** been satisfied using lookaside memory but failed due to all lookaside
 ** memory already being in use.
 ** Only the high-water value is meaningful;
-** the current value is always zero.
-** checked out.</dd>)^
+** the current value is always zero.)^
 **
 ** ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
 ** <dd>This parameter returns the approximate number of of bytes of heap

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index c3216f6e276c117380448a5b021055045d95fe99..d56b06dbc9e3d7ee07be59f070d71fe312cdd4ac 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -294,6 +294,7 @@ foreach file {
    notify.c
 
    fts3.c
+   fts3_aux.c
    fts3_expr.c
    fts3_hash.c
    fts3_porter.c