diff options
| author | drh <drh@noemail.net> | 2013-06-26 13:31:50 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-06-26 13:31:50 +0000 |
| commit | fd64cedc4be4ec9e83fe37190bbc599ae232aaf2 (patch) | |
| tree | eb26e9fd9625f522104f3343c3dd77e9296f2fc7 /src/main.c | |
| parent | 85b303df54a633e71380e3ffc0816ff952399b61 (diff) | |
| parent | 989a6dbef118464509e7a303717fd0c61bbde1b8 (diff) | |
| download | sqlite-fd64cedc4be4ec9e83fe37190bbc599ae232aaf2.tar.gz sqlite-fd64cedc4be4ec9e83fe37190bbc599ae232aaf2.zip | |
Bring the sessions branch up-to-date with all the latest trunk changes.
FossilOrigin-Name: 086a127236ee99d67513490fb7b5549e8b752c44
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 39ef5bfb5..6d3798dcb 100644 --- a/src/main.c +++ b/src/main.c @@ -701,7 +701,7 @@ static int binCollFunc( /* ** Another built-in collating sequence: NOCASE. ** -** This collating sequence is intended to be used for "case independant +** This collating sequence is intended to be used for "case independent ** comparison". SQLite's knowledge of upper and lower case equivalents ** extends only to the 26 characters used in the English language. ** @@ -1024,7 +1024,6 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){ inTrans = 1; } sqlite3BtreeRollback(p, tripCode); - db->aDb[i].inTrans = 0; } } sqlite3VtabRollback(db); @@ -2812,8 +2811,6 @@ int sqlite3_global_recover(void){ ** mode. Return TRUE if it is and FALSE if not. Autocommit mode is on ** by default. Autocommit is disabled by a BEGIN statement and reenabled ** by the next COMMIT or ROLLBACK. -** -******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ****** */ int sqlite3_get_autocommit(sqlite3 *db){ return db->autoCommit; |