aboutsummaryrefslogtreecommitdiff
path: root/src/select.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2004-09-06 17:24:11 +0000
committerdrh <drh@noemail.net>2004-09-06 17:24:11 +0000
commit9bb575fd72e8c92a39f35bfd75591b210908faad (patch)
treec71d1973ac94e40d9510c941a3ab0501591f59be /src/select.c
parent873cdcb2ce572b2c1d03d70db8ebfa03266518e9 (diff)
downloadsqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.tar.gz
sqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.zip
Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3
connection now *must* be called "sqlite3". You cannot call it "sqlite". This might break existing code. (CVS 1941) FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
Diffstat (limited to 'src/select.c')
-rw-r--r--src/select.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/select.c b/src/select.c
index 876b85641..65a24871c 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.206 2004/09/01 03:06:35 drh Exp $
+** $Id: select.c,v 1.207 2004/09/06 17:24:13 drh Exp $
*/
#include "sqliteInt.h"
@@ -565,7 +565,7 @@ static void generateSortTail(
KeyInfo *pInfo;
ExprList *pOrderBy;
int nCol, i;
- sqlite *db = pParse->db;
+ sqlite3 *db = pParse->db;
if( eDest==SRT_Sorter ) return;
pOrderBy = p->pOrderBy;
@@ -720,7 +720,7 @@ static void generateColumnNames(
){
Vdbe *v = pParse->pVdbe;
int i, j;
- sqlite *db = pParse->db;
+ sqlite3 *db = pParse->db;
int fullNames, shortNames;
/* If this is an EXPLAIN, skip this step */
@@ -1253,7 +1253,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p){
static int openTempIndex(Parse *pParse, Select *p, int iTab, int keyAsData){
KeyInfo *pKeyInfo;
int nColumn;
- sqlite *db = pParse->db;
+ sqlite3 *db = pParse->db;
int i;
Vdbe *v = pParse->pVdbe;
int addr;