Minor coding style change, adjust new local variable casing for consistency.

FossilOrigin-Name: 1a4628c66c632d2aff02bf134ddf7adceb04fb84

diff --git a/manifest b/manifest
index 86810c4e13162533d1e791e26b1dd03dd8ac1e91..c69e8fd562fd1619ef3e6ea1a9a316fd75ed983f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sassume\sthat\s"col\sIS\s?"\smatches\sat\smost\sa\ssingle\srow\sof\sa\sUNIQUE\scolumn\sunless\sthe\scolumn\sis\salso\sNOT\sNULL.
-D 2015-05-15T19:59:23.465
+C Minor\scoding\sstyle\schange,\sadjust\snew\slocal\svariable\scasing\sfor\sconsistency.
+D 2015-05-15T20:14:00.941
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -307,7 +307,7 @@ F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 F src/wal.c ce2cb2d06faab54d1bce3e739bec79e063dd9113
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
-F src/where.c 78dd9fc79b44be2a0eb37f4315b6785592cc000b
+F src/where.c 8b319f2a966ee7f88889fe500448e1e746aed998
 F src/whereInt.h a6f5a762bc1b4b1c76e1cea79976b437ac35a435
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1258,7 +1258,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 56ef98a04765c34c1c2f3ed7a6f03a732f3b886e
-R 40b8a98e6255d5ebcc7a2294b397be72
-U dan
-Z 3608bbb309c9166edff355d025615d3b
+P e038ce8955e785afcc07bb22499955bbd22a7af4
+R 256bec741f4546a6f044a3f9d89d1f28
+U mistachkin
+Z 55915481db21ec2f8d724d045635c0ba

diff --git a/manifest.uuid b/manifest.uuid
index 74e4d95f487afaced39f089acde11426d7486b5f..6d231088a299ae56e257c04165f3f592a71a4483 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e038ce8955e785afcc07bb22499955bbd22a7af4
\ No newline at end of file
+1a4628c66c632d2aff02bf134ddf7adceb04fb84
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index ab841e93fc34db99760d906b3c74b37ef96a685a..0eca517a558cf87d1dba82868fd6763e97c748d4 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -6330,15 +6330,15 @@ static int whereShortCut(WhereLoopBuilder *pBuilder){
     pLoop->rRun = 33;  /* 33==sqlite3LogEst(10) */
   }else{
     for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-      int opmask;
+      int opMask;
       assert( pLoop->aLTermSpace==pLoop->aLTerm );
       if( !IsUniqueIndex(pIdx)
        || pIdx->pPartIdxWhere!=0 
        || pIdx->nKeyCol>ArraySize(pLoop->aLTermSpace) 
       ) continue;
-      opmask = pIdx->uniqNotNull ? (WO_EQ|WO_IS) : WO_EQ;
+      opMask = pIdx->uniqNotNull ? (WO_EQ|WO_IS) : WO_EQ;
       for(j=0; j<pIdx->nKeyCol; j++){
-        pTerm = findTerm(pWC, iCur, pIdx->aiColumn[j], 0, opmask, pIdx);
+        pTerm = findTerm(pWC, iCur, pIdx->aiColumn[j], 0, opMask, pIdx);
         if( pTerm==0 ) break;
         testcase( pTerm->eOperator & WO_IS );
         pLoop->aLTerm[j] = pTerm;