From cf4312c9adc64c68b5927c09df5a32a030333da4 Mon Sep 17 00:00:00 2001 From: mistachkin Date: Thu, 14 Aug 2014 02:59:51 +0000 Subject: [PATCH 1/4] Add icon to the Windows shell executable. This is a resource change only, no changes to code. FossilOrigin-Name: f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite3.rc | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 2718e0bc1a..d4223a7aff 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\schange\sto\sunixDelete\sfor\sVxWorks\swith\sa\sDOS\sfilesystem. -D 2014-08-13T11:39:42.875 +C Add\sicon\sto\sthe\sWindows\sshell\sexecutable.\s\sThis\sis\sa\sresource\schange\sonly,\sno\schanges\sto\scode. +D 2014-08-14T02:59:51.389 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -225,7 +225,7 @@ F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be F src/select.c ea48e891406ccdf748f3eb02893e056d134a0fea F src/shell.c 75bb7bd2c80bb44861598f322a417c4bafe98fd7 F src/sqlite.h.in ed9d35990c61f0388ca6405706455c4095310553 -F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e +F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d @@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d46adf9d8f741838b9c30f915231d6a3986c3591 -R 0bcddbf637a1ae28dd56c0df43bdd1a6 -U drh -Z a0023172094bb1f589643de5ae500c6e +P f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd +R 3949cef84e476358af94bafdce6dc1cb +U mistachkin +Z 4ed18721cd3f6e17fb0699ef60e0d747 diff --git a/manifest.uuid b/manifest.uuid index 12fc1aa48f..ce1b5bf024 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd \ No newline at end of file +f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba \ No newline at end of file diff --git a/src/sqlite3.rc b/src/sqlite3.rc index aedbb63ebd..04dd086488 100644 --- a/src/sqlite3.rc +++ b/src/sqlite3.rc @@ -35,6 +35,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif /* defined(_WIN32) */ +/* + * Icon + */ + +#define IDI_SQLITE 101 + +IDI_SQLITE ICON "..\\art\\sqlite370.ico" + /* * Version */ From 4ed2fb9d84bdc76c3085c0e8baf80a53d8d57d10 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 14 Aug 2014 13:06:25 +0000 Subject: [PATCH 2/4] Fix typos in comments used to help generate documentation. No changes to code. FossilOrigin-Name: 13a2d90a2869c53b79754de39045bbbdbc7688e3 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/vdbe.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index d4223a7aff..a9e401b96b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sicon\sto\sthe\sWindows\sshell\sexecutable.\s\sThis\sis\sa\sresource\schange\sonly,\sno\schanges\sto\scode. -D 2014-08-14T02:59:51.389 +C Fix\stypos\sin\scomments\sused\sto\shelp\sgenerate\sdocumentation.\s\sNo\schanges\sto\scode. +D 2014-08-14T13:06:25.245 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -283,7 +283,7 @@ F src/update.c ea336ce7b8b3fc5e316ba8f082e6445babf81059 F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05 F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 -F src/vdbe.c cd8d7e3ecd3e0e0684f6bf48469966335c666883 +F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8 F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949 @@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f01d42cc8b00d2b7c4f14defcb05fdc493cf1bfd -R 3949cef84e476358af94bafdce6dc1cb -U mistachkin -Z 4ed18721cd3f6e17fb0699ef60e0d747 +P f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba +R b4842944a4c3679f5b3af787e9b322df +U drh +Z 52db703ea373cd617fd2c598672c0ab8 diff --git a/manifest.uuid b/manifest.uuid index ce1b5bf024..5d1e011162 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba \ No newline at end of file +13a2d90a2869c53b79754de39045bbbdbc7688e3 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 10b81a7992..61adb9cccd 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -3531,7 +3531,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 @@ -4548,7 +4548,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 */ From f216e324f9dc009b20c05e1cb5e15a4316334718 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 14 Aug 2014 19:53:37 +0000 Subject: [PATCH 3/4] Fix an assert that can fail if the database file is corrupted. FossilOrigin-Name: 3f45b8192dad7fb1f027cbaa694046e3c1b3e278 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/btree.c | 3 ++- test/corruptI.test | 26 ++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index a9e401b96b..a8fda48d5f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stypos\sin\scomments\sused\sto\shelp\sgenerate\sdocumentation.\s\sNo\schanges\sto\scode. -D 2014-08-14T13:06:25.245 +C Fix\san\sassert\sthat\scan\sfail\sif\sthe\sdatabase\sfile\sis\scorrupted. +D 2014-08-14T19:53:37.748 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -167,7 +167,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c 99d162e57af6e72ffd7db5bf79568a134cd87d5b +F src/btree.c fa057e30794bfd867963b44a3a42710a45c335a1 F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3 F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b @@ -413,7 +413,7 @@ F test/corruptE.test 193b4ca4e927e77c1d5f4f56203ddc998432a7ee F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4 F test/corruptG.test 1ab3bf97ee7bdba70e0ff3ba2320657df55d1804 F test/corruptH.test 88ed71a086e13591c917aac6de32750e7c7281cb -F test/corruptI.test b3e4203d420490fc3d3062711597bc1dea06a789 +F test/corruptI.test 0afbba50bfae006094cc548b4605f521c1179502 F test/cost.test 19d314526616ce4473eb4e4e450fcb94499ce318 F test/count.test 42a251178e32f617eda33f76236a7f79825a50b5 F test/coveridxscan.test cdb47d01acc4a634a34fd25abe85189e0d0f1e62 @@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f5cce9db109a2bbe9a05b4c01b076a51d5fad8ba -R b4842944a4c3679f5b3af787e9b322df -U drh -Z 52db703ea373cd617fd2c598672c0ab8 +P 13a2d90a2869c53b79754de39045bbbdbc7688e3 +R be8bb3bca247e348b90f7388fee24972 +U dan +Z 1fbc222a1bef7c1b8874e0319a4338ee diff --git a/manifest.uuid b/manifest.uuid index 5d1e011162..8166d1d7f4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -13a2d90a2869c53b79754de39045bbbdbc7688e3 \ No newline at end of file +3f45b8192dad7fb1f027cbaa694046e3c1b3e278 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 17719caf91..60bc7de41e 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/test/corruptI.test b/test/corruptI.test index ed34c0f8c3..41200c5409 100644 --- a/test/corruptI.test +++ b/test/corruptI.test @@ -75,5 +75,31 @@ do_test 2.2 { catchsql { SELECT * FROM r WHERE x >= 10 } } {1 {database disk image is malformed}} +reset_db + +do_execsql_test 3.1 { + PRAGMA page_size = 512; + CREATE TABLE t1(a INTEGER PRIMARY KEY, b); + WITH s(a, b) AS ( + SELECT 2, 'abcdefghij' + UNION ALL + SELECT a+2, b FROM s WHERe a < 40 + ) + INSERT INTO t1 SELECT * FROM s; +} {} + +do_test 3.2 { + hexio_write test.db [expr 512+3] 0054 + db close + sqlite3 db test.db + execsql { INSERT INTO t1 VALUES(5, 'klmnopqrst') } + execsql { INSERT INTO t1 VALUES(7, 'klmnopqrst') } +} {} + +db close +sqlite3 db test.db +do_catchsql_test 3.2 { + INSERT INTO t1 VALUES(9, 'klmnopqrst'); +} {1 {database disk image is malformed}} finish_test From 932de71e39d3192ec6138f0676fa7de41807ae2c Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 15 Aug 2014 11:46:33 +0000 Subject: [PATCH 4/4] Version 3.8.6 FossilOrigin-Name: 9491ba7d738528f168657adb43a198238abde19e --- manifest | 13 ++++++++----- manifest.uuid | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/manifest b/manifest index a8fda48d5f..28b547a053 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sassert\sthat\scan\sfail\sif\sthe\sdatabase\sfile\sis\scorrupted. -D 2014-08-14T19:53:37.748 +C Version\s3.8.6 +D 2014-08-15T11:46:33.931 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1186,7 +1186,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 13a2d90a2869c53b79754de39045bbbdbc7688e3 +P 3f45b8192dad7fb1f027cbaa694046e3c1b3e278 R be8bb3bca247e348b90f7388fee24972 -U dan -Z 1fbc222a1bef7c1b8874e0319a4338ee +T +bgcolor * #d0c0ff +T +sym-release * +T +sym-version-3.8.6 * +U drh +Z 74d8dd4d4aac0ae87245b4bcefd8b172 diff --git a/manifest.uuid b/manifest.uuid index 8166d1d7f4..01b81a4804 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3f45b8192dad7fb1f027cbaa694046e3c1b3e278 \ No newline at end of file +9491ba7d738528f168657adb43a198238abde19e \ No newline at end of file