Drop the mutex if the TSD key allocation fails. Ticket #1585. (CVS 2880)

FossilOrigin-Name: 77ac231c0e21c09c0b612a4e72bcc863f2c95fd3

diff --git a/manifest b/manifest
index ea35209cf759110839d32d7f7a9ccad37b299b43..3b109349601c25b1e332ddd02c6ed88adae023ba 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbugs\sin\stest\sscripts\sthat\scame\sof\sof\ssse\stesting.\s(CVS\s2879)
-D 2006-01-06T22:11:21
+C Drop\sthe\smutex\sif\sthe\sTSD\skey\sallocation\sfails.\s\sTicket\s#1585.\s(CVS\s2880)
+D 2006-01-07T04:06:55
 F Makefile.in c79fbdaa264c6afcd435f2fb492551de5a8cf80d
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -55,7 +55,7 @@ F src/os.h 6e61d5e901dfec761660707e892890f6760b5e63
 F src/os_common.h 78bcc34dded9b625b3c16d072b7e5b76d075a674
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 05223f8440da9b3ededd8acc5ffb1ba5e4da8731
+F src/os_unix.c ba70f76230c9cd95c08f27ec40710838ea15a785
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 88f372bf093b3257f54d2d7710f00cfcae86fb9d
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -335,7 +335,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9d71b7deaffdd7eb9ddad1f03df3e4c51c2cbd98
-R c26d93a7bc480dc90dfa2a9916cab9d8
+P 22bf1a2ffac503020dfa78d228b561d1cf6f3894
+R 4f67d90864139abe40a0021c48eb6474
 U drh
-Z 626943f0d31c84a3b631cde7e1c72b88
+Z 8cbffd6d58c70ff076573e18f16ee469

diff --git a/manifest.uuid b/manifest.uuid
index 6e0490ac0eb645049a207adb625abb88276c713e..e232b2ad10c0071c59adfa07350ac2a1126e5142 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22bf1a2ffac503020dfa78d228b561d1cf6f3894
\ No newline at end of file
+77ac231c0e21c09c0b612a4e72bcc863f2c95fd3
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index fa0cc1f9ee9f690e6fda27cf7ed29cd6bb9535b8..71125fa61ec8cab50dcc1241fb6c238e06931afc 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1678,6 +1678,7 @@ void *sqlite3UnixThreadSpecificData(int nByte){
       int rc;
       rc = pthread_key_create(&key, deleteTsd);
       if( rc ){
+        sqlite3OsLeaveMutex();
         return 0;
       }
       keyInit = 1;