Fix a bug in --changeset output for sqldiff.exe for floating-point values.

Also fix harmless compiler warnings in sqldiff.exe.

FossilOrigin-Name: 9f428530f9a6cb54f0a2fc3e666c38c7c093558a

diff --git a/manifest b/manifest
index d12240778cce3aa6023fc9de57d5ff2ebaf0abb2..35335151e4566ce66f6a83621f8d5a2db7aa6d7a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--lib\soption\sto\sthe\ssqldiff.exe\scommand-line\sutility.
-D 2015-05-04T13:25:56.940
+C Fix\sa\sbug\sin\s--changeset\soutput\sfor\ssqldiff.exe\sfor\sfloating-point\svalues.\nAlso\sfix\sharmless\scompiler\swarnings\sin\ssqldiff.exe.
+D 2015-05-04T15:04:47.871
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e628c50e237251fc7e768bef14ee7e822ad69e69
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1245,7 +1245,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
-F tool/sqldiff.c 81fff1d5fb5fdd2ed34256089a9fea7829913341
+F tool/sqldiff.c 10e3c01111f97b99627adf0954cf5ffbfba0723c
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
@@ -1256,7 +1256,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 aef1e8f47123e2e865432a0abf194dea4f23447a
-R 927b0afcec8578dc0050734afa2fcb42
+P a117e8f6bd60ed7f6e4cdcd2ee8d624fe040f7ab
+R 06db280fea07927d5f126c64abb732cd
 U drh
-Z 43417b5f51de3c57f1ade1ee8f794bde
+Z 08e1b79b8e56094ae104d865394efda7

diff --git a/manifest.uuid b/manifest.uuid
index 7f69cd286dad1f4c9511d7284f35cfbb795da60f..9d8637050fd23a9a79279863a7eda520709a8163 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a117e8f6bd60ed7f6e4cdcd2ee8d624fe040f7ab
\ No newline at end of file
+9f428530f9a6cb54f0a2fc3e666c38c7c093558a
\ No newline at end of file

diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index bfe72c4f5004adae21ed9d0eaf4f12e4c57067e7..0b3f02cd6c2d99c2911b49d7e5c15a1c0bbeb4c6 100644 (file)
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -897,19 +897,19 @@ static void putValue(FILE *out, sqlite3_value *pVal){
       for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
       break;
     case SQLITE_FLOAT:
-      rX = sqlite3_value_int64(pVal);
+      rX = sqlite3_value_double(pVal);
       memcpy(&uX, &rX, 8);
       for(j=56; j>=0; j-=8) putc((uX>>j)&0xff, out);
       break;
     case SQLITE_TEXT:
       iX = sqlite3_value_bytes(pVal);
       putsVarint(out, (sqlite3_uint64)iX);
-      fwrite(sqlite3_value_text(pVal),1,iX,out);
+      fwrite(sqlite3_value_text(pVal),1,(size_t)iX,out);
       break;
     case SQLITE_BLOB:
       iX = sqlite3_value_bytes(pVal);
       putsVarint(out, (sqlite3_uint64)iX);
-      fwrite(sqlite3_value_blob(pVal),1,iX,out);
+      fwrite(sqlite3_value_blob(pVal),1,(size_t)iX,out);
       break;
     case SQLITE_NULL:
       break;
@@ -1136,7 +1136,7 @@ int main(int argc, char **argv){
   FILE *out = stdout;
   void (*xDiff)(const char*,FILE*) = diff_one_table;
   int nExt = 0;
-  const char **azExt = 0;
+  char **azExt = 0;
 
   g.zArgv0 = argv[0];
   for(i=1; i<argc; i++){