Fix copy/paste typo in the new sqlite3_expanded_sql() function.

FossilOrigin-Name: e7d18c70d2b8f09c9f5b978fe3d69d1088e42322

diff --git a/manifest b/manifest
index 8c007e6739ce9aa5ed2eca051d48db130976be3b..0d6dec24f5f39333cafb5666af8e5c99d86cab77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sparameter\smisordering\son\ssqlite3_trace_v2()\sin\sthe\sloadable\sextension\ninterface.
-D 2016-07-14T01:13:36.176
+C Fix\scopy/paste\stypo\sin\sthe\snew\ssqlite3_expanded_sql()\sfunction.
+D 2016-07-14T09:22:16.664
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -453,7 +453,7 @@ F src/vdbe.c 7b5570f77e32766949fd8f9478e4a9bb06e6ab24
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 F src/vdbeapi.c 460b90f7f0894753d33df377702c1dc9cc5fa21b
-F src/vdbeaux.c 6083ff395021ac8c40e1b53798ee6483037e3fb7
+F src/vdbeaux.c 08a459b6906dfcce0e921daba3a471a28ea65d41
 F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
 F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
 F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@ -1505,7 +1505,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 99ee7ee58d45b29a0000492306ddc0b90563ff51
-R 2e489e2cf495d4b07e42b94b658ce2d8
-U drh
-Z d214f48401d2ba878ebf65269a7b92c1
+P 989de2d5b5e7155654d3eebadb9651b23f422c58
+R 22fe35d8085a083776873f2a488c7041
+U mistachkin
+Z 0cf3ee8d7f2e128326cc9e0cdcd59d22

diff --git a/manifest.uuid b/manifest.uuid
index b1e5ac35c8aa0020dd8345818f44a20c89f40279..9a4a235af8f57ec68d264e7ff3b89fea34a3333f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-989de2d5b5e7155654d3eebadb9651b23f422c58
\ No newline at end of file
+e7d18c70d2b8f09c9f5b978fe3d69d1088e42322
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 355021e970fe1e0f3fb26cc528cb12ca99b8b51b..72a882c17603fb9a39893daecd177f596bce3009 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -83,8 +83,8 @@ const char *sqlite3_sql(sqlite3_stmt *pStmt){
 */
 char *sqlite3_expanded_sql(sqlite3_stmt *pStmt){
   Vdbe *p = (Vdbe *)pStmt;
-  return p ? sqlite3VdbeExpandSql(p, p->zSql) : 0;
-  if( p->zSql==0 ) return 0;
+  if( p==0 || p->zSql==0 ) return 0;
+  return sqlite3VdbeExpandSql(p, p->zSql);
 }
 
 /*