From 0c6ab89b4108e6c8f0fd9e56c00e9651ddaebb3d Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 5 May 2015 18:52:54 +0000 Subject: [PATCH 1/4] Remove four lines of superfluous code identified by clang scan-build. FossilOrigin-Name: 04afa3febee32854fbb09ef8d4ffffd432119716 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/printf.c | 2 -- src/vdbe.c | 2 -- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 1788e32f45..34548d68f7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sminor\scoding\sinefficiency\sfound\sduring\spre-release\sinspection. -D 2015-05-05T16:57:52.547 +C Remove\sfour\slines\sof\ssuperfluous\scode\sidentified\sby\sclang\sscan-build. +D 2015-05-05T18:52:54.583 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -227,7 +227,7 @@ F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9 F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7 F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3 -F src/printf.c 1f87c24770b2cea3fadbec03bfb6bdcbd353802c +F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e @@ -293,7 +293,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c a6431c92803b975b7322724a7b433e538d243539 F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701 -F src/vdbe.c ff9efff0548b6a31d095ddc999d606e7605f0cdc +F src/vdbe.c d437887d02d13d79dc69ac018f788aefac3b3972 F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0 F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75 @@ -1256,7 +1256,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 b8f090e65d010c62df335d0520a36a24904e8bc6 -R aa3e34d67b680aaa71313e3178def66e +P cc50883d67334507227e1384fef6cc7c93fd7de1 +R 76d874e855b2e1920bd5ad182d7df042 U drh -Z cdb699fe6147a4b364800efebeb8babc +Z bdf9d10f7b9ce59bce00a351127a0aa2 diff --git a/manifest.uuid b/manifest.uuid index 676e81612f..5f24bf1a71 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cc50883d67334507227e1384fef6cc7c93fd7de1 \ No newline at end of file +04afa3febee32854fbb09ef8d4ffffd432119716 \ No newline at end of file diff --git a/src/printf.c b/src/printf.c index 05f2ff5a62..1d50d7790b 100644 --- a/src/printf.c +++ b/src/printf.c @@ -253,7 +253,6 @@ void sqlite3VXPrintf( } }while( !done && (c=(*++fmt))!=0 ); /* Get the field width */ - width = 0; if( c=='*' ){ if( bArgList ){ width = (int)getIntArg(pArgList); @@ -277,7 +276,6 @@ void sqlite3VXPrintf( /* Get the precision */ if( c=='.' ){ - precision = 0; c = *++fmt; if( c=='*' ){ if( bArgList ){ diff --git a/src/vdbe.c b/src/vdbe.c index e03f30c7c7..7f97de1377 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -985,7 +985,6 @@ case OP_Halt: { assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 ); rc = p->rc ? SQLITE_ERROR : SQLITE_DONE; } - pOp = &aOp[pcx]; goto vdbe_return; } @@ -5913,7 +5912,6 @@ case OP_JournalMode: { /* out2 */ } eNew = sqlite3PagerSetJournalMode(pPager, eNew); - pOut = &aMem[pOp->p2]; pOut->flags = MEM_Str|MEM_Static|MEM_Term; pOut->z = (char *)sqlite3JournalModename(eNew); pOut->n = sqlite3Strlen30(pOut->z); From b0cba4bc1169d89bec0e5e355df53593cf9571c1 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 6 May 2015 14:18:58 +0000 Subject: [PATCH 2/4] Have the autoconf package build the shell tool with SQLite linked in statically. FossilOrigin-Name: 31834c3aa7deeafee1163a67caf5f3197f07baf4 --- autoconf/Makefile.am | 3 +-- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am index 6fc4f33c0e..88bc23df45 100644 --- a/autoconf/Makefile.am +++ b/autoconf/Makefile.am @@ -7,8 +7,7 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 bin_PROGRAMS = sqlite3 sqlite3_SOURCES = shell.c sqlite3.h -sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@ -sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la +sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@ include_HEADERS = sqlite3.h sqlite3ext.h diff --git a/manifest b/manifest index 34548d68f7..6d6fcde033 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sfour\slines\sof\ssuperfluous\scode\sidentified\sby\sclang\sscan-build. -D 2015-05-05T18:52:54.583 +C Have\sthe\sautoconf\spackage\sbuild\sthe\sshell\stool\swith\sSQLite\slinked\sin\sstatically. +D 2015-05-06T14:18:58.864 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -13,7 +13,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 -F autoconf/Makefile.am 8fc2972d92769cf20ab8e4a73ea901b84d69bf44 +F autoconf/Makefile.am 4012e106208c7b86ba54d06e9ed400b59a4dee6b F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7 F autoconf/config.guess 94cc57e2a3fdb9c235b362ace86d77e89d188cad x @@ -1256,7 +1256,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 cc50883d67334507227e1384fef6cc7c93fd7de1 -R 76d874e855b2e1920bd5ad182d7df042 -U drh -Z bdf9d10f7b9ce59bce00a351127a0aa2 +P 04afa3febee32854fbb09ef8d4ffffd432119716 +R c802443e961f136bbb49cf06ee4d41db +U dan +Z de033081a6dd5244aca249205579af45 diff --git a/manifest.uuid b/manifest.uuid index 5f24bf1a71..7f767af7e0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04afa3febee32854fbb09ef8d4ffffd432119716 \ No newline at end of file +31834c3aa7deeafee1163a67caf5f3197f07baf4 \ No newline at end of file From 9b40e474ef8a9f9dff379aeb5ac4ad9e29899829 Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 7 May 2015 00:09:29 +0000 Subject: [PATCH 3/4] Remove a faulty assert() statement. FossilOrigin-Name: 5f2539da8cb9df99029ab4ab7023804722697673 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/resolve.c | 1 - test/select4.test | 3 +++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 6d6fcde033..5da91d4d65 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Have\sthe\sautoconf\spackage\sbuild\sthe\sshell\stool\swith\sSQLite\slinked\sin\sstatically. -D 2015-05-06T14:18:58.864 +C Remove\sa\sfaulty\sassert()\sstatement. +D 2015-05-07T00:09:29.803 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -229,7 +229,7 @@ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3 F src/printf.c 54dd6dce95454fadffa3ebf7717c5f6c06250d1d F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 -F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d +F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3 F src/shell.c 1b6fc902d4455b7a4d6d9cc9a23d3f6af7089302 @@ -843,7 +843,7 @@ F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5 F test/select1.test be62204d2bd9a5a8a149e9974cfddce893d8f686 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054 -F test/select4.test ac1cd55264a43872b49efac3a4f01a95ab6c6d50 +F test/select4.test 824342f382f16b4afe42d0887ef82b3d6abb6075 F test/select5.test e758b8ef94f69b111df4cb819008856655dcd535 F test/select6.test 39eac4a5c03650b2b473c532882273283ee8b7a0 F test/select7.test 7fd2ef598cfabb6b9ff6ac13973b91d0527df49d @@ -1256,7 +1256,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 04afa3febee32854fbb09ef8d4ffffd432119716 -R c802443e961f136bbb49cf06ee4d41db -U dan -Z de033081a6dd5244aca249205579af45 +P 31834c3aa7deeafee1163a67caf5f3197f07baf4 +R 014968d54fc9fdc23120a39f420a5f8f +U drh +Z 0f95adc7c225baa520f1175eee89a43c diff --git a/manifest.uuid b/manifest.uuid index 7f767af7e0..953203fe8d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -31834c3aa7deeafee1163a67caf5f3197f07baf4 \ No newline at end of file +5f2539da8cb9df99029ab4ab7023804722697673 \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index b75db42ef6..23636eacec 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -99,7 +99,6 @@ static void resolveAlias( assert( iCol>=0 && iColnExpr ); pOrig = pEList->a[iCol].pExpr; assert( pOrig!=0 ); - assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 ); db = pParse->db; pDup = sqlite3ExprDup(db, pOrig, 0); if( pDup==0 ) return; diff --git a/test/select4.test b/test/select4.test index a1619e59ca..c0f88a1507 100644 --- a/test/select4.test +++ b/test/select4.test @@ -158,6 +158,9 @@ do_test select4-2.4 { }} msg] lappend v $msg } {1 {ORDER BY clause should come after UNION not before}} +do_execsql_test select4-2.5 { + SELECT 123 AS x ORDER BY (SELECT x ORDER BY 1); +} {123} # Except operator # From 8f109e396f7b8e9aa76b22efcc3370f87b86eeed Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 7 May 2015 11:53:08 +0000 Subject: [PATCH 4/4] Version 3.8.10 FossilOrigin-Name: cf975957b9ae671f34bb65f049acf351e650d437 --- manifest | 11 +++++++---- manifest.uuid | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/manifest b/manifest index 5da91d4d65..b7d0b1b60e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\sfaulty\sassert()\sstatement. -D 2015-05-07T00:09:29.803 +C Version\s3.8.10 +D 2015-05-07T11:53:08.287 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 08728ecbeddca339c77bfd564d3484b523dffdb1 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1256,7 +1256,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 31834c3aa7deeafee1163a67caf5f3197f07baf4 +P 5f2539da8cb9df99029ab4ab7023804722697673 R 014968d54fc9fdc23120a39f420a5f8f +T +bgcolor * #d0c0ff +T +sym-release * +T +sym-version-3.8.10 * U drh -Z 0f95adc7c225baa520f1175eee89a43c +Z 6270ca72fe7be4337004b813fe656c7c diff --git a/manifest.uuid b/manifest.uuid index 953203fe8d..8e4d2fce57 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5f2539da8cb9df99029ab4ab7023804722697673 \ No newline at end of file +cf975957b9ae671f34bb65f049acf351e650d437 \ No newline at end of file