From: drh <drh@noemail.net>
Date: Wed, 31 Aug 2011 18:35:34 +0000 (+0000)
Subject: Always include the unixShm.id field, even when not debugging.
X-Git-Tag: version-3.7.8~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd53231c8587ac7eb19e0b8b5d92af1c865e23ab;p=thirdparty%2Fsqlite.git

Always include the unixShm.id field, even when not debugging.

FossilOrigin-Name: 07803476206b8cde60ccc320b9ccdc0d48a41d65
---

diff --git a/manifest b/manifest
index 0eeabd1cea..b378643159 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\screate\sthe\ssqlite3OSTrace\sglobal\svariable\sif\scompiling\swith\s\nSQLITE_TEST.
-D 2011-08-31T18:04:54.752
+C Always\sinclude\sthe\sunixShm.id\sfield,\seven\swhen\snot\sdebugging.
+D 2011-08-31T18:35:34.234
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os.c fcc717427a80b2ed225373f07b642dc1aad7490b
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h b15945976976c80e9a29c2d331a9c6fb42d3efa5
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c ae82cf32c497d9a3a0f147de1b7219b636db4f53
+F src/os_unix.c 9e6e26b96b10e62a5dc678ea95bbb16d05fcca6e
 F src/os_win.c 45de13c6c3501cfd6469b2b34149b823060e39f4
 F src/pager.c 817f7f7140c9fa2641f28e6330e924708ddd870d
 F src/pager.h 2bab1b2ea4eac58663b5833e3522e36b5ff63447
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P df550066657cb41bad34ac8e722b8148ab7eabfb
-R ba2041aae6bc957791be99b48d3a5d63
+P 9e6a4c1473a4cb061a88f6a437a2828368b3ddc8
+R 834dac199e1c9ebe831f91eccddde409
 U drh
-Z 1de22a554319629ea944db035b2e3bd4
+Z 761dac1f8bf1d111d08b2e615a88c98b
diff --git a/manifest.uuid b/manifest.uuid
index cad37e447c..5bdd31701d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e6a4c1473a4cb061a88f6a437a2828368b3ddc8
\ No newline at end of file
+07803476206b8cde60ccc320b9ccdc0d48a41d65
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index f273d04cb6..1c5a5bad56 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3640,11 +3640,9 @@ struct unixShm {
   unixShmNode *pShmNode;     /* The underlying unixShmNode object */
   unixShm *pNext;            /* Next unixShm with the same unixShmNode */
   u8 hasMutex;               /* True if holding the unixShmNode mutex */
+  u8 id;                     /* Id of this connection within its unixShmNode */
   u16 sharedMask;            /* Mask of shared locks held */
   u16 exclMask;              /* Mask of exclusive locks held */
-#ifdef SQLITE_DEBUG
-  u8 id;                     /* Id of this connection within its unixShmNode */
-#endif
 };
 
 /*