From: drh <drh@noemail.net>
Date: Fri, 28 Mar 2014 12:56:57 +0000 (+0000)
Subject: Fix a harmless compiler warning.
X-Git-Tag: version-3.8.5~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36ed03428d501b8de6b86aeca09f27c9ec5869ad;p=thirdparty%2Fsqlite.git

Fix a harmless compiler warning.

FossilOrigin-Name: a4e47150f32b3a4120b1f89ccc66d633d829e3bb
---

diff --git a/manifest b/manifest
index 48ca1421b2..3f74055a6f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\ssqlite3VdbeRecordCompare()\sroutines\sso\sthat\sif\sthey\sencounter\ndatabase\scorruption,\sthey\swill\sset\sthe\sUnpackedRecord.isCorrupt\sfield\sand\nreturn\s0.\s\sThe\ssqlite3BtreeMovetoUnpacked()\sroutine\sdetects\sthis\sand\sreturns\nSQLITE_CORRUPT,\scausing\sthe\scorruption\sto\sbe\sreported\sback\sto\sthe\stop-level.
-D 2014-03-28T03:12:48.763
+C Fix\sa\sharmless\scompiler\swarning.
+D 2014-03-28T12:56:57.685
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -291,7 +291,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 7c53de68bd6762848b746510cf4eb077ffd7d70d
+F src/where.c 7d539cedb1c6a6d6b5d2075b8fea3a48db4838eb
 F src/whereInt.h 2564055b440e44ebec8b47f237bbccae6719b7af
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1159,7 +1159,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 9b4d7226bcee38be5ac68a54bee03b4179cb69fc
-R e6ff5922142fb694f528da1c1b2a1baf
+P 7fa85eaaaf6d211378620d728a759fdfe30a15b0
+R 84c408a5c4c5e7a44048ef6100ea9043
 U drh
-Z 2ba581858b0e7a94365bc5b4fc44e179
+Z 645b10a99877639c66e2a5f7ed2d5a66
diff --git a/manifest.uuid b/manifest.uuid
index ef58fd2f6f..b73eec43f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7fa85eaaaf6d211378620d728a759fdfe30a15b0
\ No newline at end of file
+a4e47150f32b3a4120b1f89ccc66d633d829e3bb
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 16e7e40bc3..93ee8c59c3 100644
--- a/src/where.c
+++ b/src/where.c
@@ -4936,7 +4936,7 @@ static i8 wherePathSatisfiesOrderBy(
       }
     }
   } /* End the loop over all WhereLoops from outer-most down to inner-most */
-  if( obSat==obDone ) return nOrderBy;
+  if( obSat==obDone ) return (i8)nOrderBy;
   if( !isOrderDistinct ){
     for(i=nOrderBy-1; i>0; i--){
       Bitmask m = MASKBIT(i) - 1;