Fossil SCM

Merge in the SQLite fix from trunk.

drh 2011-04-27 20:01 windows-i18n merge
Commit a9425fe17f7b3df080a6ddf78d4ffbd0c1801bb9
Parent e805fa8db90fb3e…
2 files changed +4 -4 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+4 -4
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650650
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651651
 ** [sqlite_version()] and [sqlite_source_id()].
652652
 */
653653
 #define SQLITE_VERSION "3.7.6.1"
654654
 #define SQLITE_VERSION_NUMBER 3007006
655
-#define SQLITE_SOURCE_ID "2011-04-27 16:05:42 7b479b9bee93df909edecd44c7d6584d943b39c9"
655
+#define SQLITE_SOURCE_ID "2011-04-27 19:54:44 f55156c5194e85c47728b8a97fde3e5f0a5c9b56"
656656
657657
 /*
658658
 ** CAPI3REF: Run-Time Library Version Numbers
659659
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660660
 **
@@ -32102,11 +32102,11 @@
3210232102
 #if SQLITE_OS_WINCE==0
3210332103
 }else{
3210432104
 res = UnlockFile(pFile->h, SHARED_FIRST + pFile->sharedLockByte, 0, 1, 0);
3210532105
 #endif
3210632106
 }
32107
- if( res == 0 ){
32107
+ if( res==0 && GetLastError()!=ERROR_NOT_LOCKED ){
3210832108
 pFile->lastErrno = GetLastError();
3210932109
 winLogError(SQLITE_IOERR_UNLOCK, "unlockReadLock", pFile->zPath);
3211032110
 }
3211132111
 return res;
3211232112
 }
@@ -82409,11 +82409,11 @@
8240982409
 /*
8241082410
 ** Implementation of the sqlite_log() function. This is a wrapper around
8241182411
 ** sqlite3_log(). The return value is NULL. The function exists purely for
8241282412
 ** its side-effects.
8241382413
 */
82414
-static void logFunc(
82414
+static void errlogFunc(
8241582415
 sqlite3_context *context,
8241682416
 int argc,
8241782417
 sqlite3_value **argv
8241882418
 ){
8241982419
 UNUSED_PARAMETER(argc);
@@ -83186,11 +83186,11 @@
8318683186
 FUNCTION(random, 0, 0, 0, randomFunc ),
8318783187
 FUNCTION(randomblob, 1, 0, 0, randomBlob ),
8318883188
 FUNCTION(nullif, 2, 0, 1, nullifFunc ),
8318983189
 FUNCTION(sqlite_version, 0, 0, 0, versionFunc ),
8319083190
 FUNCTION(sqlite_source_id, 0, 0, 0, sourceidFunc ),
83191
- FUNCTION(sqlite_log, 2, 0, 0, logFunc ),
83191
+ FUNCTION(sqlite_log, 2, 0, 0, errlogFunc ),
8319283192
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
8319383193
 FUNCTION(sqlite_compileoption_used,1, 0, 0, compileoptionusedFunc ),
8319483194
 FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc ),
8319583195
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
8319683196
 FUNCTION(quote, 1, 0, 0, quoteFunc ),
8319783197
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651 ** [sqlite_version()] and [sqlite_source_id()].
652 */
653 #define SQLITE_VERSION "3.7.6.1"
654 #define SQLITE_VERSION_NUMBER 3007006
655 #define SQLITE_SOURCE_ID "2011-04-27 16:05:42 7b479b9bee93df909edecd44c7d6584d943b39c9"
656
657 /*
658 ** CAPI3REF: Run-Time Library Version Numbers
659 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660 **
@@ -32102,11 +32102,11 @@
32102 #if SQLITE_OS_WINCE==0
32103 }else{
32104 res = UnlockFile(pFile->h, SHARED_FIRST + pFile->sharedLockByte, 0, 1, 0);
32105 #endif
32106 }
32107 if( res == 0 ){
32108 pFile->lastErrno = GetLastError();
32109 winLogError(SQLITE_IOERR_UNLOCK, "unlockReadLock", pFile->zPath);
32110 }
32111 return res;
32112 }
@@ -82409,11 +82409,11 @@
82409 /*
82410 ** Implementation of the sqlite_log() function. This is a wrapper around
82411 ** sqlite3_log(). The return value is NULL. The function exists purely for
82412 ** its side-effects.
82413 */
82414 static void logFunc(
82415 sqlite3_context *context,
82416 int argc,
82417 sqlite3_value **argv
82418 ){
82419 UNUSED_PARAMETER(argc);
@@ -83186,11 +83186,11 @@
83186 FUNCTION(random, 0, 0, 0, randomFunc ),
83187 FUNCTION(randomblob, 1, 0, 0, randomBlob ),
83188 FUNCTION(nullif, 2, 0, 1, nullifFunc ),
83189 FUNCTION(sqlite_version, 0, 0, 0, versionFunc ),
83190 FUNCTION(sqlite_source_id, 0, 0, 0, sourceidFunc ),
83191 FUNCTION(sqlite_log, 2, 0, 0, logFunc ),
83192 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
83193 FUNCTION(sqlite_compileoption_used,1, 0, 0, compileoptionusedFunc ),
83194 FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc ),
83195 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
83196 FUNCTION(quote, 1, 0, 0, quoteFunc ),
83197
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -650,11 +650,11 @@
650 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651 ** [sqlite_version()] and [sqlite_source_id()].
652 */
653 #define SQLITE_VERSION "3.7.6.1"
654 #define SQLITE_VERSION_NUMBER 3007006
655 #define SQLITE_SOURCE_ID "2011-04-27 19:54:44 f55156c5194e85c47728b8a97fde3e5f0a5c9b56"
656
657 /*
658 ** CAPI3REF: Run-Time Library Version Numbers
659 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
660 **
@@ -32102,11 +32102,11 @@
32102 #if SQLITE_OS_WINCE==0
32103 }else{
32104 res = UnlockFile(pFile->h, SHARED_FIRST + pFile->sharedLockByte, 0, 1, 0);
32105 #endif
32106 }
32107 if( res==0 && GetLastError()!=ERROR_NOT_LOCKED ){
32108 pFile->lastErrno = GetLastError();
32109 winLogError(SQLITE_IOERR_UNLOCK, "unlockReadLock", pFile->zPath);
32110 }
32111 return res;
32112 }
@@ -82409,11 +82409,11 @@
82409 /*
82410 ** Implementation of the sqlite_log() function. This is a wrapper around
82411 ** sqlite3_log(). The return value is NULL. The function exists purely for
82412 ** its side-effects.
82413 */
82414 static void errlogFunc(
82415 sqlite3_context *context,
82416 int argc,
82417 sqlite3_value **argv
82418 ){
82419 UNUSED_PARAMETER(argc);
@@ -83186,11 +83186,11 @@
83186 FUNCTION(random, 0, 0, 0, randomFunc ),
83187 FUNCTION(randomblob, 1, 0, 0, randomBlob ),
83188 FUNCTION(nullif, 2, 0, 1, nullifFunc ),
83189 FUNCTION(sqlite_version, 0, 0, 0, versionFunc ),
83190 FUNCTION(sqlite_source_id, 0, 0, 0, sourceidFunc ),
83191 FUNCTION(sqlite_log, 2, 0, 0, errlogFunc ),
83192 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
83193 FUNCTION(sqlite_compileoption_used,1, 0, 0, compileoptionusedFunc ),
83194 FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc ),
83195 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
83196 FUNCTION(quote, 1, 0, 0, quoteFunc ),
83197
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.7.6.1"
111111
 #define SQLITE_VERSION_NUMBER 3007006
112
-#define SQLITE_SOURCE_ID "2011-04-27 16:05:42 7b479b9bee93df909edecd44c7d6584d943b39c9"
112
+#define SQLITE_SOURCE_ID "2011-04-27 19:54:44 f55156c5194e85c47728b8a97fde3e5f0a5c9b56"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.7.6.1"
111 #define SQLITE_VERSION_NUMBER 3007006
112 #define SQLITE_SOURCE_ID "2011-04-27 16:05:42 7b479b9bee93df909edecd44c7d6584d943b39c9"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.7.6.1"
111 #define SQLITE_VERSION_NUMBER 3007006
112 #define SQLITE_SOURCE_ID "2011-04-27 19:54:44 f55156c5194e85c47728b8a97fde3e5f0a5c9b56"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button