/ Check-in [bd9ee0ea]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Disable an assert that is sometimes generated spuriously.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | threads
Files: files | file ages | folders
SHA1:bd9ee0ea69181526cfc3cadac33a5ec5190112b0
User & Date: mistachkin 2014-07-29 21:44:13
Context
2014-07-30
14:44
Merge recent trunk changes, and especially the fix for the CREATE UNIQUE INDEX problem of ticket [9a6daf340df99ba9]. check-in: 5b50a838 user: drh tags: threads
2014-07-29
21:44
Disable an assert that is sometimes generated spuriously. check-in: bd9ee0ea user: mistachkin tags: threads
19:00
Update return value checking to conform to the beginthreadex() specs. check-in: 3144a16f user: mistachkin tags: threads
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/threads.c.

   115    115   /* Thread procedure Win32 compatibility shim */
   116    116   static unsigned __stdcall sqlite3ThreadProc(
   117    117     void *pArg  /* IN: Pointer to the SQLiteThread structure */
   118    118   ){
   119    119     SQLiteThread *p = (SQLiteThread *)pArg;
   120    120   
   121    121     assert( p!=0 );
          122  +#if 0
          123  +  /*
          124  +  ** This assert appears to trigger spuriously on certain
          125  +  ** versions of Windows, possibly due to _beginthreadex()
          126  +  ** and/or CreateThread() not fully setting their thread
          127  +  ** ID parameter before starting the thread.
          128  +  */
   122    129     assert( p->id==GetCurrentThreadId() );
          130  +#endif
   123    131     assert( p->xTask!=0 );
   124    132     p->pResult = p->xTask(p->pIn);
   125    133   
   126    134     _endthreadex(0);
   127    135     return 0; /* NOT REACHED */
   128    136   }
   129    137