Rearrange some internal fields in the sqlite3_stmt object to avoid a harmless

TSAN warning.

FossilOrigin-Name: e0b116edd64a55c971c368685aa343cb6beed0f1

diff --git a/manifest b/manifest
index 95e98afa0f0bf260cd0b52fe445cdc7654fbcd99..8154a2631d514ed3170a6b5b28b61f454bf44745 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sOP_IntegrityCk\sopcode\sto\saccept\sthe\slist\sof\sroot\spages\sas\san\nintarray\sargument\sin\sP4.\s\sSlightly\ssmaller\sand\sfaster.
-D 2016-03-15T22:00:39.610
+C Rearrange\ssome\sinternal\sfields\sin\sthe\ssqlite3_stmt\sobject\sto\savoid\sa\sharmless\nTSAN\swarning.
+D 2016-03-16T00:36:19.731
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -418,7 +418,7 @@ F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 F src/vdbe.c 8cf45bb8da77d39f55d108e759d15a57acd0255c
 F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
-F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
+F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
 F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
@@ -1456,7 +1456,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 9463762c437488970a87093ef13131c39b2adadc
-R 6817ca21db6938155940db404d48bb61
+P 15e4a272df46cbad8e71b21551dc06a126d64d46
+R 82478b12d64974258326bdaae56626ca
 U drh
-Z e5f48f52274ef8efc53f2f946a6d2fff
+Z e403476d229295941bbcf1df1a4408f9

diff --git a/manifest.uuid b/manifest.uuid
index a7f49d3bce442b1e1d73d58aeea64e2d820b1a62..f76cceaf73f50caa3606bcddccb5996bbdf7bbf6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15e4a272df46cbad8e71b21551dc06a126d64d46
\ No newline at end of file
+e0b116edd64a55c971c368685aa343cb6beed0f1
\ No newline at end of file

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index b53952fd44bbaca9a23e8ee3bd0e2166d0bdbd26..a78795f61ced85226d31015d76c01f1f50cdb8e8 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -381,16 +381,16 @@ struct Vdbe {
 #endif
   u16 nResColumn;         /* Number of columns in one row of the result set */
   u8 errorAction;         /* Recovery action to do in case of an error */
+  bft expired:1;          /* True if the VM needs to be recompiled */
+  bft doingRerun:1;       /* True if rerunning after an auto-reprepare */
   u8 minWriteFileFormat;  /* Minimum file format for writable database files */
   bft explain:2;          /* True if EXPLAIN present on SQL command */
   bft changeCntOn:1;      /* True to update the change-counter */
-  bft expired:1;          /* True if the VM needs to be recompiled */
   bft runOnlyOnce:1;      /* Automatically expire on reset */
   bft usesStmtJournal:1;  /* True if uses a statement journal */
   bft readOnly:1;         /* True for statements that do not write */
   bft bIsReader:1;        /* True for statements that read */
   bft isPrepareV2:1;      /* True if prepared with prepare_v2() */
-  bft doingRerun:1;       /* True if rerunning after an auto-reprepare */
   int nChange;            /* Number of db changes made since last reset */
   yDbMask btreeMask;      /* Bitmask of db->aDb[] entries referenced */
   yDbMask lockMask;       /* Subset of btreeMask that requires a lock */