diff options
| author | danielk1977 <danielk1977@noemail.net> | 2008-06-18 18:08:39 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2008-06-18 18:08:39 +0000 |
| commit | bc10d7730ca8b4373d64061e640865b23fdddf1f (patch) | |
| tree | 160ca3077497e4102684daa65f4f0c5a0cb32aaa | |
| parent | 01bf29966d616fe6e93837bbca529c082fdb3415 (diff) | |
| download | sqlite-bc10d7730ca8b4373d64061e640865b23fdddf1f.tar.gz sqlite-bc10d7730ca8b4373d64061e640865b23fdddf1f.zip | |
Add a call to sqlite3_initialize() to sqlite3_mutex_alloc() (CVS 5236)
FossilOrigin-Name: 8b23b719440aca9fca7e8f409729c3318ff3f80c
| -rw-r--r-- | manifest | 12 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/mutex.c | 5 |
3 files changed, 11 insertions, 8 deletions
@@ -1,5 +1,5 @@ -C Fix\sa\stest\scase\sin\smutex1.test\sthat\swas\sfailing\swhen\ssqlite\swas\scompiled\swith\sSQLITE_THREADSAFE=0.\s(CVS\s5235) -D 2008-06-18T17:59:04 +C Add\sa\scall\sto\ssqlite3_initialize()\sto\ssqlite3_mutex_alloc()\s(CVS\s5236) +D 2008-06-18T18:08:39 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in dc5608df93faf4406cfd7a1c8ed9ab93d8bfbfd5 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -123,7 +123,7 @@ F src/mem2.c 468a7fd5e0ce1909cfb554d7589af1d4a61f14bb F src/mem3.c 28b4812b87470a00b11821fb5850e7cabcce06c6 F src/mem4.c 6703adb1717b26d9d70a1c2586b4b7b7ffee7909 F src/mem5.c ad31a0a481b86b86f4ac0b6d952e69727d4e113a -F src/mutex.c bcd07a29039b192c59117a5eb08fce208fe7d5aa +F src/mutex.c 8d8f3cdd4be7184e50dd806a485730cf500f95e5 F src/mutex.h b9b9baf7050f3bb1c723e1d22088a704783a2927 F src/mutex_os2.c b8c1231319e966875f251a7ec137bea353546b87 F src/mutex_unix.c 469a35c105435794375d683f75cad9e848817d19 @@ -597,7 +597,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 5059644c4bc5f6679afd939e0bc26080f42a9918 -R e1b007e18a61486333f37eed7d20669e +P d1a87c3bcc9a32918f1cf743f85cd1a71557220e +R 2889563ab68a678e373207022a120810 U danielk1977 -Z 3a46c90858d1f487bb77585ca61e818d +Z 2c927c6baa472eb569be9409a45d4432 diff --git a/manifest.uuid b/manifest.uuid index c155534ba..f0b6a48c6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d1a87c3bcc9a32918f1cf743f85cd1a71557220e
\ No newline at end of file +8b23b719440aca9fca7e8f409729c3318ff3f80c
\ No newline at end of file diff --git a/src/mutex.c b/src/mutex.c index 1b399a40d..9b8dfda89 100644 --- a/src/mutex.c +++ b/src/mutex.c @@ -19,7 +19,7 @@ ** implementation is suitable for testing. ** debugging purposes ** -** $Id: mutex.c,v 1.24 2008/06/18 17:09:10 danielk1977 Exp $ +** $Id: mutex.c,v 1.25 2008/06/18 18:08:39 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -80,6 +80,9 @@ int sqlite3_mutex_end(void){ ** Retrieve a pointer to a static mutex or allocate a new dynamic one. */ sqlite3_mutex *sqlite3_mutex_alloc(int id){ +#ifndef SQLITE_OMIT_AUTOINIT + if( sqlite3_initialize() ) return 0; +#endif return sqlite3Config.mutex.xMutexAlloc(id); } |