From: drh <drh@noemail.net>
Date: Mon, 29 Aug 2005 16:40:52 +0000 (+0000)
Subject: Initialize a local variable to avoid a nuisance compiler warning.
X-Git-Tag: version-3.6.10~3521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b46b57745ddf0d131843e229fc13a3dbc231f545;p=thirdparty%2Fsqlite.git

Initialize a local variable to avoid a nuisance compiler warning.
Ticket #1394. (CVS 2638)

FossilOrigin-Name: 9b914901a18f8ea39c39a51509c0b3b862c13d6a
---

diff --git a/manifest b/manifest
index 28b69bdb5c..799cedf05c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sLIKE\soptimization\sdoes\sthe\sright\sthing\swhen\scollating\ssequences\sare\r\npresent.\s\sLIKE\sexpressions\swhere\sthe\sleft-hand\sside\shas\sCOLLATE\sNOCASE\r\nare\soptimized\sin\sthe\sdefault\scase.\s(CVS\s2637)
-D 2005-08-28T17:00:23
+C Initialize\sa\slocal\svariable\sto\savoid\sa\snuisance\scompiler\swarning.\nTicket\s#1394.\s(CVS\s2638)
+D 2005-08-29T16:40:53
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -87,7 +87,7 @@ F src/vdbeapi.c f1adebb5e3fe4724ed0e1a82c4a61809d7e15e9e
 F src/vdbeaux.c 192e0dbeaaa0bfa652b0c2579c19894e5e5626fc
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 4732fd4d1a75dc38549493d7f9a81d02bf7c59b5
-F src/where.c 14a2f906f5c6d6353690c4cb9c3702eaf4da8944
+F src/where.c bbb973cbbd862b6b872faac39716a3fe13adfb44
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
@@ -299,7 +299,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 73b430de0c0f3cd230861fc1a53691818f17de0d
-R b31a17c35808ac3ee086098bd4d86db8
+P ef84ff795c85e9d28f1cac84ff42d8d4ef84cfc4
+R 48080c33fd9c8ec18b4d4c5b999ce67c
 U drh
-Z 655e339e68d859a37945f6b381f71e9c
+Z 3e9d07ef7774554dfa1e6c7f7ef031ab
diff --git a/manifest.uuid b/manifest.uuid
index d7883782dc..4dd7df2eb4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef84ff795c85e9d28f1cac84ff42d8d4ef84cfc4
\ No newline at end of file
+9b914901a18f8ea39c39a51509c0b3b862c13d6a
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 3e59338ecd..27b05e21db 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.166 2005/08/28 17:00:25 drh Exp $
+** $Id: where.c,v 1.167 2005/08/29 16:40:53 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -736,10 +736,10 @@ static int isSortingIndex(
   int nEqCol,             /* Number of index columns with == constraints */
   int *pbRev              /* Set to 1 if ORDER BY is DESC */
 ){
-  int i, j;                    /* Loop counters */
-  int sortOrder;               /* Which direction we are sorting */
-  int nTerm;                   /* Number of ORDER BY terms */
-  struct ExprList_item *pTerm; /* A term of the ORDER BY clause */
+  int i, j;                       /* Loop counters */
+  int sortOrder = SQLITE_SO_ASC;  /* Which direction we are sorting */
+  int nTerm;                      /* Number of ORDER BY terms */
+  struct ExprList_item *pTerm;    /* A term of the ORDER BY clause */
   sqlite3 *db = pParse->db;
 
   assert( pOrderBy!=0 );