From a670b22641862f42b0c4a88e3aa2e09a2ce17360 Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 14 May 2007 16:50:48 +0000
Subject: [PATCH] Fix a problem with ORDER BY and compound SELECT queries. (CVS
 3995)

FossilOrigin-Name: af76928fc5891f9a222ac0c39f8b443a9707b9e3
---
 manifest       | 14 +++++++-------
 manifest.uuid  |  2 +-
 src/select.c   |  4 ++--
 test/fuzz.test | 13 ++++++++++++-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index c3e4951f17..0ef18fac84 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\s"flattening"\soptimization.\sOccured\sif\sthe\sparent\sof\sthe\sflattened\ssub-query\sis\salso\sthe\sparent\sof\sa\ssub-query\sthat\suses\sa\scompound\sop\s(i.e.\sUNION,\sINTERSECT\setc.).\s(CVS\s3994)
-D 2007-05-14T15:49:44
+C Fix\sa\sproblem\swith\sORDER\sBY\sand\scompound\sSELECT\squeries.\s(CVS\s3995)
+D 2007-05-14T16:50:49
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -99,7 +99,7 @@ F src/pragma.c 6d5eb19feef9e84117b9b17a4c38b12b8c1c6897
 F src/prepare.c 87c23644986b5e41a58bc76f05abebd899e00089
 F src/printf.c 05b233c7a39aec4c54c79ef87af24f0a6591175d
 F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
-F src/select.c 0075d98428a570b88be68555681dc6d97ada7e2e
+F src/select.c c10b98aeccc67a9724c37bbecd6553e5a8da5bf6
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c d07ae326b3815d80f71c69b3c7584382e47f6447
 F src/sqlite.h.in 664b8702c27dc742584788823c548491ac8935d6
@@ -248,7 +248,7 @@ F test/fts2l.test 4c53c89ce3919003765ff4fd8d98ecf724d97dd3
 F test/fts2m.test 4b30142ead6f3ed076e880a2a464064c5ad58c51
 F test/fts2n.test a70357e72742681eaebfdbe9007b87ff3b771638
 F test/func.test bf30bac1c5ce10448ab739994268cf18f8b3fa30
-F test/fuzz.test 0669d41a446b1e4ccc80e868e7a56fbb0f625c34
+F test/fuzz.test f5c67c3bbf2031d6d1c08a546569831d53dc6452
 F test/fuzz2.test fdbea571808441c12c91e9cd038eb77b4692d42b
 F test/hook.test 7e7645fd9a033f79cce8fdff151e32715e7ec50a
 F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
@@ -490,7 +490,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P b1d1b16e9857a1c05f60cf2ae15f5a534b0dd0ac
-R b9512c73a0efc847c1f6f52b98d9ff58
+P 1c33829c9ebcf1ff1bd21b161c73a642471b613a
+R 74dda36291eea9b6f0fd1e20ec50a297
 U danielk1977
-Z d0d6b5393092c51da922cfae2e5f56ea
+Z fb87e50598d8586a8e44de44e21c1fa0
diff --git a/manifest.uuid b/manifest.uuid
index 604b4151c3..16669af5af 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1c33829c9ebcf1ff1bd21b161c73a642471b613a
\ No newline at end of file
+af76928fc5891f9a222ac0c39f8b443a9707b9e3
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 457504f870..445d192025 100644
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.347 2007/05/14 15:49:44 danielk1977 Exp $
+** $Id: select.c,v 1.348 2007/05/14 16:50:49 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -2000,7 +2000,7 @@ static int multiSelect(
       assert( p->pRightmost==p );
       assert( p->addrOpenEphm[2]>=0 );
       addr = p->addrOpenEphm[2];
-      sqlite3VdbeChangeP2(v, addr, p->pEList->nExpr+2);
+      sqlite3VdbeChangeP2(v, addr, p->pOrderBy->nExpr+2);
       pKeyInfo->nField = nOrderByExpr;
       sqlite3VdbeChangeP3(v, addr, (char*)pKeyInfo, P3_KEYINFO_HANDOFF);
       pKeyInfo = 0;
diff --git a/test/fuzz.test b/test/fuzz.test
index 439490cd76..cb2af0dd57 100644
--- a/test/fuzz.test
+++ b/test/fuzz.test
@@ -19,7 +19,7 @@
 #
 # The most complicated trees are for SELECT statements.
 #
-# $Id: fuzz.test,v 1.9 2007/05/14 15:49:44 danielk1977 Exp $
+# $Id: fuzz.test,v 1.10 2007/05/14 16:50:49 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -485,6 +485,17 @@ do_test fuzz-1.12.2 {
   }
 } {}
 
+
+do_test fuzz-1.13 {
+  # The problem here was that when there were more expressions in
+  # the ORDER BY list than the result-set list. The temporary b-tree
+  # used for sorting was being misconfigured in this case.
+  #
+  execsql {
+    SELECT 'abcd' UNION SELECT 'efgh' ORDER BY 1 ASC, 1 ASC;
+  }
+} {abcd efgh}
+
 #----------------------------------------------------------------
 # Test some fuzzily generated expressions.
 #