Declare the isInterrupted field of the sqlite3 structure to be volatile.

Ticket #3369. (CVS 5694)

FossilOrigin-Name: 414da4ebcecbed37177aecf649ddd3d258af260d

diff --git a/manifest b/manifest
index 454ea824eea7681351e708276778b3c55f49b3c9..123346a94bd8ddb207a2586dd28c9f323b63f8fb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\scase\sto\spermutations.test\sto\srun\stests\swith\sthe\sIOCAP_SAFEAPPEND\sproperty\sset.\s(CVS\s5693)
-D 2008-09-12T10:22:40
+C Declare\sthe\sisInterrupted\sfield\sof\sthe\ssqlite3\sstructure\sto\sbe\svolatile.\nTicket\s#3369.\s(CVS\s5694)
+D 2008-09-12T16:03:48
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -151,7 +151,7 @@ F src/select.c eec7c5f28a0c75fdd8500630435af176bba73219
 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
 F src/sqlite.h.in 81dc1e8e50fb5c7cccf0a67a34cb796efc1d2a1e
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
-F src/sqliteInt.h 4a43cd9dcb7d5a6664a981f08e64d555acbca1bc
+F src/sqliteInt.h dbe2797806c48f4a90adfea69dfbea95edd722ae
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
@@ -635,7 +635,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 753caa20ca50bc42d747d934ccc61438790e7f32
-R 1b0f464c326623228199c42b7b823ee9
-U danielk1977
-Z efa4aeae72cd5490bfab255177e78baa
+P 80bdaafa77ec5c967f633eaaf5ee6f493a6e5a56
+R 459f9fc431217cf781a414864860109b
+U drh
+Z 0b8a274367e2088529ac83c60572b420

diff --git a/manifest.uuid b/manifest.uuid
index aa264a88d594cdfcba038608eda3a45f9463812e..0e8751c32b627ce2b1171e1fec4dfbf61d8b8144 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80bdaafa77ec5c967f633eaaf5ee6f493a6e5a56
\ No newline at end of file
+414da4ebcecbed37177aecf649ddd3d258af260d
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 29a8efe70160697c309e5f51051097fee110f91a..af12e0f866bc44c661893f6b1873e9f889872ed4 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.771 2008/09/04 17:17:39 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.772 2008/09/12 16:03:48 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -713,7 +713,7 @@ struct sqlite3 {
   char *zErrMsg;                /* Most recent error message (UTF-8 encoded) */
   char *zErrMsg16;              /* Most recent error message (UTF-16 encoded) */
   union {
-    int isInterrupted;          /* True if sqlite3_interrupt has been called */
+    volatile int isInterrupted; /* True if sqlite3_interrupt has been called */
     double notUsed1;            /* Spacer */
   } u1;
   Lookaside lookaside;          /* Lookaside malloc configuration */