Make sure the correct printf format is used for type tRowcnt regardless

of whether 32-bit or 64-bit row counts are specified at compile-time.

FossilOrigin-Name: e97d7d3044aa6c5e21d1faab7d5e709d92faa261

diff --git a/manifest b/manifest
index 7d258a314652914e45ab10e470cb012a22245eee..a72ced4c6c44beee683de9d47ffbdd312684fc57 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sa\sconditional\sinside\sof\san\s#ifdef\sin\sorder\sto\smake\sall\sbranches\nreachable\sregardless\sof\scompile-time\soptions\sused.
-D 2013-10-08T23:16:48.921
+C Make\ssure\sthe\scorrect\sprintf\sformat\sis\sused\sfor\stype\stRowcnt\sregardless\nof\swhether\s32-bit\sor\s64-bit\srow\scounts\sare\sspecified\sat\scompile-time.
+D 2013-10-09T19:07:22.896
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -157,7 +157,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c 2af0330bb1b601af7a7789bf7229675fd772a083
-F src/analyze.c bc391d7c98247b402e053176dbc26d6fa3fca689
+F src/analyze.c 4383cd3ceeb1c93de4b142b11761e85294ce2c41
 F src/attach.c 0a17c9364895316ca4f52d06a97a72c0af1ae8b3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
@@ -1121,7 +1121,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P dd03be1065537679c2daf5e4200902c47714fceb
-R f20e6d4e438216466d250cd8b119b240
+P f7cc30d45b77f58c258b21f5823c2b39a44e2bf5
+R 78b5ffec5e7f00f3e552898f1fba4dac
 U drh
-Z 57caf4818cc792e398e89d2b5ddc9030
+Z 0f6503bc07f710c6b5b79c1a4c3be97a

diff --git a/manifest.uuid b/manifest.uuid
index b28ec7360864872eb4a5c2aa20fa343df7ffc077..72ac48a4b91f9680710be4141d4f6a6d92288160 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7cc30d45b77f58c258b21f5823c2b39a44e2bf5
\ No newline at end of file
+e97d7d3044aa6c5e21d1faab7d5e709d92faa261
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index d02c516f9ea4185b3c098c96b61768fd08e55f64..c83133a4dfca0ccd7d88d1daa4a03bc22e51612c 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -743,12 +743,12 @@ static void statGet(
       return;
     }
 
-    sqlite3_snprintf(24, zRet, "%lld", p->nRow);
+    sqlite3_snprintf(24, zRet, "%llu", (u64)p->nRow);
     z = zRet + sqlite3Strlen30(zRet);
     for(i=0; i<(p->nCol-1); i++){
-      i64 nDistinct = p->current.anDLt[i] + 1;
-      i64 iVal = (p->nRow + nDistinct - 1) / nDistinct;
-      sqlite3_snprintf(24, z, " %lld", iVal);
+      u64 nDistinct = p->current.anDLt[i] + 1;
+      u64 iVal = (p->nRow + nDistinct - 1) / nDistinct;
+      sqlite3_snprintf(24, z, " %llu", iVal);
       z += sqlite3Strlen30(z);
       assert( p->current.anEq[i] );
     }
@@ -789,7 +789,7 @@ static void statGet(
         int i;
         char *z = zRet;
         for(i=0; i<p->nCol; i++){
-          sqlite3_snprintf(24, z, "%lld ", aCnt[i]);
+          sqlite3_snprintf(24, z, "%llu ", (u64)aCnt[i]);
           z += sqlite3Strlen30(z);
         }
         assert( z[0]=='\0' && z>zRet );