mirror of
https://github.com/sqlite/sqlite.git
synced 2025-11-14 00:22:38 +03:00
Fix for ticket #3382 was mistakenly removed by (5712). Add an assert to
prevent it from being removed again. (CVS 5733) FossilOrigin-Name: 01d26b3df7029f7fa09231c18a7b9f9a1a967916
This commit is contained in:
@@ -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.475 2008/09/17 00:13:12 drh Exp $
|
||||
** $Id: select.c,v 1.476 2008/09/23 09:36:10 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
|
||||
@@ -2047,7 +2047,7 @@ static int multiSelectOrderBy(
|
||||
int labelEnd; /* Label for the end of the overall SELECT stmt */
|
||||
int j1; /* Jump instructions that get retargetted */
|
||||
int op; /* One of TK_ALL, TK_UNION, TK_EXCEPT, TK_INTERSECT */
|
||||
KeyInfo *pKeyDup; /* Comparison information for duplicate removal */
|
||||
KeyInfo *pKeyDup = 0; /* Comparison information for duplicate removal */
|
||||
KeyInfo *pKeyMerge; /* Comparison information for merging rows */
|
||||
sqlite3 *db; /* Database connection */
|
||||
ExprList *pOrderBy; /* The ORDER BY clause */
|
||||
@@ -2055,6 +2055,7 @@ static int multiSelectOrderBy(
|
||||
int *aPermute; /* Mapping from ORDER BY terms to result set columns */
|
||||
|
||||
assert( p->pOrderBy!=0 );
|
||||
assert( pKeyDup==0 ); /* "Managed" code needs this. Ticket #3382. */
|
||||
db = pParse->db;
|
||||
v = pParse->pVdbe;
|
||||
if( v==0 ) return SQLITE_NOMEM;
|
||||
|
||||
Reference in New Issue
Block a user