Use sqlite3_trace_v2() instead of sqlite3_trace() in the shell.

FossilOrigin-Name: c8e0539b970585cbb3619461a53abb0c3b308a17

diff --git a/manifest b/manifest
index 58ad849efb587d427d705bfad409978064ca3de9..882bad73579993d098eaf8683c52703ccb9fa655 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sjson_quote()\sfunction\sto\sthe\sJSON1\sextension.
-D 2016-07-23T19:34:53.707
+C Use\ssqlite3_trace_v2()\sinstead\sof\ssqlite3_trace()\sin\sthe\sshell.
+D 2016-07-23T20:27:41.266
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -384,7 +384,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
-F src/shell.c a8a9e392a6a2777fabf5feb536931cb190f235e5
+F src/shell.c ad6375a1cbfb13786bfc7ae28e00d822aedefd35
 F src/sqlite.h.in 3dc7317ded4bf66facd845705f45f21d03517940
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
@@ -1507,8 +1507,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8817dedb75430e6c78ff527f7ded4abb35776cef 2c3714aebf5e40e3728877a235b3c1f93defa33e
-R d8b644436fd0d857689e119dadae618e
-T +closed 2c3714aebf5e40e3728877a235b3c1f93defa33e
+P 269892abf6e59c417729669cc764d1f237e093fd
+R 38c94a12899d68429eb06d66defc6359
 U drh
-Z e34798b2dc952c68e869c2ddf5f79301
+Z 4041e092b34c5d7817e039ca6e44ec6c

diff --git a/manifest.uuid b/manifest.uuid
index 49e513c3f79143bf72981f6c27cae46ef2204aa9..771fe8bf2ce08f948bfae25571ee42f69e5a2b22 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-269892abf6e59c417729669cc764d1f237e093fd
\ No newline at end of file
+c8e0539b970585cbb3619461a53abb0c3b308a17
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 874782c5f15c9ccaf7837eccda4bb7ab47263b9a..4a546ccfefedc63266cc31c3061e4cf46ba1c845 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2543,13 +2543,20 @@ static FILE *output_file_open(const char *zFile){
 /*
 ** A routine for handling output from sqlite3_trace().
 */
-static void sql_trace_callback(void *pArg, const char *z){
+static int sql_trace_callback(
+  unsigned mType,
+  void *pArg,
+  void *pP,
+  void *pX
+){
   FILE *f = (FILE*)pArg;
   if( f ){
+    const char *z = (const char*)pX;
     int i = (int)strlen(z);
     while( i>0 && z[i-1]==';' ){ i--; }
     utf8_printf(f, "%.*s;\n", i, z);
   }
+  return 0;
 }
 
 /*
@@ -4655,9 +4662,9 @@ static int do_meta_command(char *zLine, ShellState *p){
     p->traceOut = output_file_open(azArg[1]);
 #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
     if( p->traceOut==0 ){
-      sqlite3_trace(p->db, 0, 0);
+      sqlite3_trace_v2(p->db, 0, 0, 0);
     }else{
-      sqlite3_trace(p->db, sql_trace_callback, p->traceOut);
+      sqlite3_trace_v2(p->db, SQLITE_TRACE_STMT, sql_trace_callback,p->traceOut);
     }
 #endif
   }else