From: drh <drh@noemail.net>
Date: Fri, 21 Mar 2014 18:45:19 +0000 (+0000)
Subject: Merge the OFFSET-on-query-without-FROM fix from trunk.
X-Git-Tag: version-3.8.5~109^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc08fa48b85faa6464bec904ee54dfffb244212d;p=thirdparty%2Fsqlite.git

Merge the OFFSET-on-query-without-FROM fix from trunk.

FossilOrigin-Name: 71e9ae72c272dc86720b2bfe719f57de437c400b
---

cc08fa48b85faa6464bec904ee54dfffb244212d
diff --cc manifest
index e0157af624,68306cb2c1..d2ff62a057
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C New\stest\scase\sfor\sblock-sorting.
- D 2014-03-21T15:24:07.126
 -C Fix\sthe\sOFFSET\sclause\sso\sthat\sit\sworks\scorrectly\son\squeries\sthat\slack\na\sFROM\sclause.\s\sTicket\s[07d6a0453d4ed8].
 -D 2014-03-21T18:16:23.398
++C Merge\sthe\sOFFSET-on-query-without-FROM\sfix\sfrom\strunk.
++D 2014-03-21T18:45:19.215
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -217,7 -217,7 +217,7 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 12534449e77ff54fca5d3e9fcddc10031b13fbc1
 -F src/select.c bea5181682a75940f4f555bfd1020169cc8f1657
++F src/select.c 596b8098be41e6256968f167d1d8ece2be08d082
  F src/shell.c cee9f46f2688a261601b1fd3d7f4b3cddf9b5cdf
  F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@@ -291,8 -291,8 +291,8 @@@ F src/vtab.c 21b932841e51ebd7d075e2d0ad
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c d6d99a4d83c58dfdd66cd9d93d41a22f3488e31c
 -F src/where.c eed0b83bd7ffef4ac2f7a2fcc9dcfa66b18b8b9e
 -F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
++F src/where.c f394453e4960462e62671158199f060ac956f8bc
 +F src/whereInt.h 2564055b440e44ebec8b47f237bbccae6719b7af
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -1157,7 -1156,7 +1157,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P eca35871c34374ca9189c7c9b6d490ac3c30357f
- R f6c9f43506e02e19d33da5c08cba37a5
 -P d5a1530bdc7ace053d05d1a037551110021d3758
 -R e96408bb9b93596f5e755db9dbf77630
++P e70cfa28aa393661ccc742ecd5e672d807bdd0a9 179ef81648b0ad557df78b7712f216b876b6fb65
++R 654a6218c0c034c3e6462d9f9d0a06b2
  U drh
- Z 983388db59b02f32fb79fe85b7106067
 -Z f1228f80df0ab7ad7b6a23acd634c66b
++Z 7a7ab7eaa2946af0174662f0ca0e6009
diff --cc manifest.uuid
index fe6f27d9c8,0c9a994b80..d1f85a0601
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e70cfa28aa393661ccc742ecd5e672d807bdd0a9
 -179ef81648b0ad557df78b7712f216b876b6fb65
++71e9ae72c272dc86720b2bfe719f57de437c400b
diff --cc src/select.c
index bb72e1ae70,65e4ae7d67..f81a5ef3e7
--- a/src/select.c
+++ b/src/select.c
@@@ -629,8 -578,8 +629,9 @@@ static void selectInnerLoop
    assert( v );
    assert( pEList!=0 );
    hasDistinct = pDistinct ? pDistinct->eTnctType : WHERE_DISTINCT_NOOP;
 -  if( pOrderBy==0 && !hasDistinct ){
 +  if( pSort && pSort->pOrderBy==0 ) pSort = 0;
 +  if( pSort==0 && !hasDistinct ){
+     assert( iContinue!=0 );
      codeOffset(v, p->iOffset, iContinue);
    }