diff options
| author | drh <drh@noemail.net> | 2014-08-15 15:10:46 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-15 15:10:46 +0000 |
| commit | f3a3dfe9f1d931c7b46369d69d4ed573a4f15d66 (patch) | |
| tree | 6900def2e54075c6e4aa863e282f47e5025dd797 /src | |
| parent | d0738004cac55100950abcba372bdccecbb1267c (diff) | |
| parent | 932de71e39d3192ec6138f0676fa7de41807ae2c (diff) | |
| download | sqlite-f3a3dfe9f1d931c7b46369d69d4ed573a4f15d66.tar.gz sqlite-f3a3dfe9f1d931c7b46369d69d4ed573a4f15d66.zip | |
Update the sessions branch for version 3.8.6.
FossilOrigin-Name: 2acbeac1fd9b9feb26e1c24d4ae50ce79f17a3f8
Diffstat (limited to 'src')
| -rw-r--r-- | src/btree.c | 3 | ||||
| -rw-r--r-- | src/sqlite3.rc | 8 | ||||
| -rw-r--r-- | src/vdbe.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/btree.c b/src/btree.c index 17719caf9..60bc7de41 100644 --- a/src/btree.c +++ b/src/btree.c @@ -5741,7 +5741,8 @@ static void insertCell( if( *pRC ) return; assert( i>=0 && i<=pPage->nCell+pPage->nOverflow ); - assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921 ); + assert( MX_CELL(pPage->pBt)<=10921 ); + assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB ); assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) ); assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) ); assert( sqlite3_mutex_held(pPage->pBt->mutex) ); diff --git a/src/sqlite3.rc b/src/sqlite3.rc index aedbb63eb..04dd08648 100644 --- a/src/sqlite3.rc +++ b/src/sqlite3.rc @@ -36,6 +36,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif /* defined(_WIN32) */ /* + * Icon + */ + +#define IDI_SQLITE 101 + +IDI_SQLITE ICON "..\\art\\sqlite370.ico" + +/* * Version */ diff --git a/src/vdbe.c b/src/vdbe.c index 7e50d357a..1dae82ff9 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3541,7 +3541,7 @@ case OP_Close: { ** the key and P2 is not zero, then jump to P2. ** ** This opcode leaves the cursor configured to move in forward order, -** from the begining toward the end. In other words, the cursor is +** from the beginning toward the end. In other words, the cursor is ** configured to use Next, not Prev. ** ** See also: Found, NotFound, SeekLt, SeekGe, SeekLe @@ -4609,7 +4609,7 @@ case OP_Sort: { /* jump */ ** to the following instruction. ** ** This opcode leaves the cursor configured to move in forward order, -** from the begining toward the end. In other words, the cursor is +** from the beginning toward the end. In other words, the cursor is ** configured to use Next, not Prev. */ case OP_Rewind: { /* jump */ |