Add a couple more assert statements.

FossilOrigin-Name: 4e816db235025c7998c649fddabfd807290a08b9

diff --git a/manifest b/manifest
index 064bb2589f64e68c362366bea934230c34f345ce..968ac9514beaff5dce18a53bcb04fceb8da6134a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sunreachable\sbranches\sin\sthe\sthreads.c\smodule.
-D 2014-07-29T18:46:30.709
+C Add\sa\scouple\smore\sassert\sstatements.
+D 2014-07-29T18:53:01.887
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -277,7 +277,7 @@ F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
 F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
-F src/threads.c b4152ced8515d11a2293c036109069a4e23d78a8
+F src/threads.c c0c04b9c8beed10327412819126edbc6f3b3d4d7
 F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec
 F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
 F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
@@ -1189,7 +1189,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 216d21d0e62b3c0ad49f3cb395c845bf4f17ac61
-R ccb9d21b3a566e207d222a64f9b56de4
-U drh
-Z 93aca20bb7a5a87f1d3c643bafb97dd4
+P 3175e366bbf7579ec9ab27214b0a4e5cd27ea204
+R f89aa137e4caaa8d5d9c03d775d53084
+U mistachkin
+Z 86b91bc53f3caa97895c33b5247f45da

diff --git a/manifest.uuid b/manifest.uuid
index cdfed7b950d1251835a2bea5d396c0a86626a853..bb2eb8265bd881345bcb823542fa9cdcaa49c878 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3175e366bbf7579ec9ab27214b0a4e5cd27ea204
\ No newline at end of file
+4e816db235025c7998c649fddabfd807290a08b9
\ No newline at end of file

diff --git a/src/threads.c b/src/threads.c
index 7cd2256b49c3d2a8adf4521f81495ae9135eab90..8bb24003b75bae6a3da64fe792f250c74fd2ff5d 100644 (file)
--- a/src/threads.c
+++ b/src/threads.c
@@ -168,7 +168,9 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
   assert( ppOut!=0 );
   if( NEVER(p==0) ) return SQLITE_NOMEM;
   if( p->xTask==0 ){
+    assert( p->id==GetCurrentThreadId() );
     rc = WAIT_OBJECT_0;
+    assert( p->tid==0 );
   }else{
     assert( p->id!=0 && p->id!=GetCurrentThreadId() );
     rc = sqlite3Win32Wait((HANDLE)p->tid);