diff options
| author | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2014-09-15 15:34:31 +0000 |
| commit | d4a80e6742921478b369a9537302bc586c79d812 (patch) | |
| tree | 6731ece80e9d8851555cad39c555482f1db1a006 /src/main.c | |
| parent | ee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 (diff) | |
| parent | 907214c8e83a3d1f35b6cce5768016089193b3c2 (diff) | |
| download | sqlite-d4a80e6742921478b369a9537302bc586c79d812.tar.gz sqlite-d4a80e6742921478b369a9537302bc586c79d812.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 55b8011d5b455927f5b92a3cb911fd909fb0edab
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index f73817e29..6da74cbf2 100644 --- a/src/main.c +++ b/src/main.c @@ -985,6 +985,10 @@ void sqlite3LeaveMutexAndCloseZombie(sqlite3 *db){ sqlite3Error(db, SQLITE_OK); /* Deallocates any cached error strings. */ sqlite3ValueFree(db->pErr); sqlite3CloseExtensions(db); +#if SQLITE_USER_AUTHENTICATION + sqlite3_free(db->auth.zAuthUser); + sqlite3_free(db->auth.zAuthPW); +#endif db->magic = SQLITE_MAGIC_ERROR; @@ -2566,7 +2570,6 @@ static int openDatabase( db->aDb[0].pSchema = sqlite3SchemaGet(db, db->aDb[0].pBt); db->aDb[1].pSchema = sqlite3SchemaGet(db, 0); - /* The default safety_level for the main database is 'full'; for the temp ** database it is 'NONE'. This matches the pager layer defaults. */ @@ -2853,9 +2856,9 @@ int sqlite3_get_autocommit(sqlite3 *db){ } /* -** The following routines are subtitutes for constants SQLITE_CORRUPT, +** The following routines are substitutes for constants SQLITE_CORRUPT, ** SQLITE_MISUSE, SQLITE_CANTOPEN, SQLITE_IOERR and possibly other error -** constants. They server two purposes: +** constants. They serve two purposes: ** ** 1. Serve as a convenient place to set a breakpoint in a debugger ** to detect when version error conditions occurs. @@ -3169,7 +3172,7 @@ int sqlite3_test_control(int op, ...){ ** IMPORTANT: Changing the PENDING byte from 0x40000000 results in ** an incompatible database file format. Changing the PENDING byte ** while any database connection is open results in undefined and - ** dileterious behavior. + ** deleterious behavior. */ case SQLITE_TESTCTRL_PENDING_BYTE: { rc = PENDING_BYTE; |