diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 2 | ||||
| -rw-r--r-- | src/sqlite.h.in | 4 | ||||
| -rw-r--r-- | src/sqliteInt.h | 2 | ||||
| -rw-r--r-- | src/sqliteLimit.h | 4 | ||||
| -rw-r--r-- | src/vdbemem.c | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/src/pager.c b/src/pager.c index 9ab6262ef..9686eb904 100644 --- a/src/pager.c +++ b/src/pager.c @@ -5054,7 +5054,7 @@ static void sqlite3PagerSetCodec( void *pCodec ){ if( pPager->xCodecFree ) pPager->xCodecFree(pPager->pCodec); - pPager->xCodec = xCodec; + pPager->xCodec = pPager->memDb ? 0 : xCodec; pPager->xCodecSizeChng = xCodecSizeChng; pPager->xCodecFree = xCodecFree; pPager->pCodec = pCodec; diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 967986e4b..b206d0156 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -820,7 +820,7 @@ struct sqlite3_vfs { ** The sqlite3_initialize() routine initializes the ** SQLite library. The sqlite3_shutdown() routine ** deallocates any resources that were allocated by sqlite3_initialize(). -** This routines are designed to aid in process initialization and +** These routines are designed to aid in process initialization and ** shutdown on embedded systems. Workstation applications using ** SQLite normally do not need to invoke either of these routines. ** @@ -2390,7 +2390,7 @@ int sqlite3_limit(sqlite3*, int id, int newVal); ** In the "v2" interfaces, the prepared statement ** that is returned (the [sqlite3_stmt] object) contains a copy of the ** original SQL text. This causes the [sqlite3_step()] interface to -** behave a differently in three ways: +** behave differently in three ways: ** ** <ol> ** <li> diff --git a/src/sqliteInt.h b/src/sqliteInt.h index b47eba43c..24debbabe 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1508,7 +1508,7 @@ struct AggInfo { ** the option is available (at compile-time). */ #if SQLITE_MAX_VARIABLE_NUMBER<=32767 -typedef i64 ynVar; +typedef i16 ynVar; #else typedef int ynVar; #endif diff --git a/src/sqliteLimit.h b/src/sqliteLimit.h index 77d78589a..700420e3b 100644 --- a/src/sqliteLimit.h +++ b/src/sqliteLimit.h @@ -197,9 +197,5 @@ ** may be executed. */ #ifndef SQLITE_MAX_TRIGGER_DEPTH -#if defined(SQLITE_SMALL_STACK) -# define SQLITE_MAX_TRIGGER_DEPTH 10 -#else # define SQLITE_MAX_TRIGGER_DEPTH 1000 #endif -#endif diff --git a/src/vdbemem.c b/src/vdbemem.c index 83483244b..e0200d80e 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -1009,7 +1009,7 @@ int sqlite3ValueFromExpr( } op = pExpr->op; if( op==TK_REGISTER ){ - op = pExpr->op2; + op = pExpr->op2; /* This only happens with SQLITE_ENABLE_STAT2 */ } if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){ |