Rearrange code so that tests pass whether SQLITE_DEBUG is defined or not.

FossilOrigin-Name: 89296a46c3b891ee0b637ff6f89d828d6e46e7b5

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 3fb14585260971b95da82700096f89eae489762c..eb1d3c4b61dc46b9faebeb0033e447d75a34d290 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -1019,17 +1019,14 @@ static i64 fts5IndexDataVersion(Fts5Index *p){
 ** is called, it is a no-op.
 */
 static Fts5Structure *fts5StructureRead(Fts5Index *p){
-  Fts5Structure *pRet;            /* Object to return */
 
   if( p->pStruct==0 ){
     p->iStructVersion = fts5IndexDataVersion(p);
     if( p->rc==SQLITE_OK ){
-      p->pStruct = pRet = fts5StructureReadUncached(p);
+      p->pStruct = fts5StructureReadUncached(p);
     }
-    if( p->rc!=SQLITE_OK ) return 0;
-    assert( p->iStructVersion!=0 );
-    assert( p->pStruct!=0 );
   }
+
 #ifdef SQLITE_DEBUG
   else{
     Fts5Structure *pTest = fts5StructureReadUncached(p);
@@ -1053,9 +1050,11 @@ static Fts5Structure *fts5StructureRead(Fts5Index *p){
   }
 #endif
 
-  pRet = p->pStruct;
-  fts5StructureRef(pRet);
-  return pRet;
+  if( p->rc!=SQLITE_OK ) return 0;
+  assert( p->iStructVersion!=0 );
+  assert( p->pStruct!=0 );
+  fts5StructureRef(p->pStruct);
+  return p->pStruct;
 }
 
 static void fts5StructureInvalidate(Fts5Index *p){

diff --git a/manifest b/manifest
index 346832e33ff4b57e668e5027e73b5464ddf1228f..65691a0210fae473cb5478bb12f67078c8911763 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\sfts5multiclient.test.
-D 2016-03-19T14:47:28.441
+C Rearrange\scode\sso\sthat\stests\spass\swhether\sSQLITE_DEBUG\sis\sdefined\sor\snot.
+D 2016-03-21T15:18:13.028
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -104,7 +104,7 @@ F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
 F ext/fts5/fts5_expr.c 35e9d92c89e7c7ea0759b73d24da1ecb7630a24b
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
-F ext/fts5/fts5_index.c afac2ffe3198776626b99366e18af1f32ea9eb85
+F ext/fts5/fts5_index.c 39939320ee5185cbfd0a8c8c7e1c878ebde7c43d
 F ext/fts5/fts5_main.c b4a0fc5bf17f2f1f056ee76cdd7d2af08b360f55
 F ext/fts5/fts5_storage.c a3361410422e69639ca2bcd5a56a0933dadf84d2
 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
@@ -1457,7 +1457,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 020a0bda59fe93b9361ceeed0d5a8ba4177380c8
-R f14c9b8edfca8f7bf113e7bd0b21996b
+P 7832466f9177cca59455ba272802145297fcd53d
+R e2f3ffc019af1c2320d4d618c0233909
 U dan
-Z d493def8e880a32e2aca451bc5e776cf
+Z 04b6e502bb8ccbe0b89bf7d08daf8ee8

diff --git a/manifest.uuid b/manifest.uuid
index 91ed807a0bce6bd40f50724ff4164cea88de7e2b..62bde4070e1002827fbe5e5144413f0f0974013e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7832466f9177cca59455ba272802145297fcd53d
\ No newline at end of file
+89296a46c3b891ee0b637ff6f89d828d6e46e7b5
\ No newline at end of file