From: drh <drh@noemail.net>
Date: Sat, 24 Mar 2012 16:18:08 +0000 (+0000)
Subject: Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined.
X-Git-Tag: mountain-lion~3^2~9^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=790964ebc45da08d4de8dfa25ebfb4223e89c2c4;p=thirdparty%2Fsqlite.git

Fix a bug in debugging code enabled when FTS3_LOG_MERGES is defined.

FossilOrigin-Name: 2e06babf49de844d0e878d68114dbcc5ad4d6e54
---

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 8919962baf..a92081f871 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1127,7 +1127,7 @@ static int fts3AllocateSegdirIdx(
     ** if iNext is less than FTS3_MERGE_COUNT, allocate index iNext.
     */
     if( iNext>=FTS3_MERGE_COUNT ){
-      fts3LogMerge(16, getAbsoluteLevel(iLevel, iLangid, iIndex));
+      fts3LogMerge(16, getAbsoluteLevel(p, iLevel, iLangid, iIndex));
       rc = fts3SegmentMerge(p, iLangid, iIndex, iLevel);
       *piIdx = 0;
     }else{
diff --git a/manifest b/manifest
index ae8fb47763..b3e124c856 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sFts3Table.mxLevel\svariable.
-D 2012-03-24T16:11:21.049
+C Fix\sa\sbug\sin\sdebugging\scode\senabled\swhen\sFTS3_LOG_MERGES\sis\sdefined.
+D 2012-03-24T16:18:08.837
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/fts3_test.c 6b7cc68aef4efb084e1449f7d20c4b20d3bdf6b4
 F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
 F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_write.c 9c9d3062f50d35a0f8b88e5e8f926b622cc210aa
+F ext/fts3/fts3_write.c d96bd53e22074c4b35b3db3b9544ac3e55616333
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 1c68687ab6d05b100191663820e7d82377d52445
-R f7873f1fffcc305e18231176cdb210c4
-U dan
-Z c98b0e8c409bca973107326748221c8a
+P 67a0cffc9d07be7f09dad9d019a18160711295cd
+R b9a75c391c5508df678e65c2562d628a
+U drh
+Z 4e5e71ac5e6024845db251d7d739e1ab
diff --git a/manifest.uuid b/manifest.uuid
index c164bc0827..9efe1a35d6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-67a0cffc9d07be7f09dad9d019a18160711295cd
\ No newline at end of file
+2e06babf49de844d0e878d68114dbcc5ad4d6e54
\ No newline at end of file