database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Have PRAGMA busy_timeout return 0 if the busy handler has been changed

Browse Source 
or cancelled.

FossilOrigin-Name: 7be5bc36798d30f50658b70fc0bd31af897f3a87
This commit is contained in:
drh
2012-09-07 18:49:57 +00:00
parent f360396c47
commit c0c7b5ee74
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pragma.c
View File

@@ -1541,9 +1541,9 @@ void sqlite3Pragma(
** PRAGMA busy_timeout = N
**
** Call sqlite3_busy_timeout(db, N). Return the current timeout value
** if one is set. If the busy handler is not set to the default
** busy callback, then the return value is undefined. A value of N
** which is 0 or negative disables the busy handler.
** if one is set. If no busy handler or a different busy handler is set
** then 0 is returned. Setting the busy_timeout to 0 or negative
** disables the timeout.
*/
if( sqlite3StrICmp(zLeft, "busy_timeout")==0 ){
if( zRight ){