From: mistachkin <mistachkin@noemail.net>
Date: Wed, 10 Dec 2014 17:34:48 +0000 (+0000)
Subject: Revise mutex handling by the sqlite3_win32_reset_heap() function.
X-Git-Tag: version-3.8.8~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684ec98fe3f0a11aa825a8747a6724225ee30a24;p=thirdparty%2Fsqlite.git

Revise mutex handling by the sqlite3_win32_reset_heap() function.

FossilOrigin-Name: eacb3b7baa910e84f984b8e45695a2a2f5a4c861
---

diff --git a/manifest b/manifest
index 07a4a6fd33..18deb8120f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\sthe\sdocumentation\sfor\ssqlite3_table_column_metadata().\nNo\schanges\sto\scode.
-D 2014-12-10T04:58:43.490
+C Revise\smutex\shandling\sby\sthe\ssqlite3_win32_reset_heap()\sfunction.
+D 2014-12-10T17:34:48.091
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
-F src/os_win.c a9e500dd963fb1f67d7860e58b5772abe6123862
+F src/os_win.c ecb04a0dad2fa6fa659931a9d8f0f3aca33f908a
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
 F src/pager.c 7a5c5bc0e29b9b16834f5558a9d5d22bbae59a08
 F src/pager.h d1eee3c3f741be247ce6d82752a178515fc8578b
@@ -1226,7 +1226,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P cf9be419a16156a9814e1378bb49b780de977343
-R 080e42720ecc05dbe5a6fab44e9bfd04
-U drh
-Z 55e0d7a4f974fc615b3f61db59cc799b
+P 3528f8dd39acace8eeb7337994c8617313f4b04b
+R fe43d40d066c10ff075f9f4225f2f387
+U mistachkin
+Z cb29644ec15937d54f010f859dadafbb
diff --git a/manifest.uuid b/manifest.uuid
index 9199a8d464..47c85f8870 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3528f8dd39acace8eeb7337994c8617313f4b04b
\ No newline at end of file
+eacb3b7baa910e84f984b8e45695a2a2f5a4c861
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 2a7681c73f..80ce97a6cd 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1203,8 +1203,8 @@ int sqlite3_win32_reset_heap(){
   int rc;
   MUTEX_LOGIC( sqlite3_mutex *pMaster; ) /* The main static mutex */
   MUTEX_LOGIC( sqlite3_mutex *pMem; )    /* The memsys static mutex */
-  MUTEX_LOGIC( pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); )
-  MUTEX_LOGIC( pMem = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM); )
+  MUTEX_LOGIC( pMaster = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER); )
+  MUTEX_LOGIC( pMem = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MEM); )
   sqlite3_mutex_enter(pMaster);
   sqlite3_mutex_enter(pMem);
   winMemAssertMagic();