Fix a typo preventing this from building with SQLITE_ENABLE_STMT_SCANSTATUS defined.

FossilOrigin-Name: 4c5714ab3dba19513374c7b1478221a0b90b450c

diff --git a/manifest b/manifest
index 134366e0aa11cefbe8b490a690671838e97d5a32..75cfa9ca43c40bffcbeb7dcbbfd63b4071f990a4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sthe\sinterface\sto\smake\sit\smore\seasily\sextensible.
-D 2014-11-03T16:35:55.977
+C Fix\sa\stypo\spreventing\sthis\sfrom\sbuilding\swith\sSQLITE_ENABLE_STMT_SCANSTATUS\sdefined.
+D 2014-11-03T16:39:37.742
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -229,7 +229,7 @@ F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 428165951748151e87a15295b7357221433e311b
 F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
-F src/sqlite.h.in a110c6320b3af8d7c0660fa1adbc530b6caa2d95
+F src/sqlite.h.in 26b6aa6a1825b97c0fa16ce14fc657be00c299f6
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h 4f86ac648ea398c1bb3db036062934cde257ea23
@@ -292,7 +292,7 @@ F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 F src/vdbe.c 175a360c56e75ce4eb2b60704fd7c011b93926f5
 F src/vdbe.h d412bd01e89f0d69991b8f46601f96bc169d28f4
 F src/vdbeInt.h 539ba284790e871f98be74a78cbdfcedfae22639
-F src/vdbeapi.c 76d62888455e3d3ffeaf70911cefa94e76a4678a
+F src/vdbeapi.c 900259bdd85cd66a9f210d8ec08147a9034593bd
 F src/vdbeaux.c cf6b8152dd22155201d57c216e6266866b61da59
 F src/vdbeblob.c 8b5442ff0954c44b45cbabbe2e94091a2e16fdef
 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
@@ -1211,7 +1211,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 a2303c719222f1effb51acc6b37930561148c00c
-R cbd06b886fdee03f70c2bf18e1342ca1
-U drh
-Z 0328a60e2b5415c07361c47ade3f21c5
+P 7955342da4a35b57e4ae26690b8d40f7bba20e8f
+R c9becfda3a2880c1d6a40a42c50145fa
+U dan
+Z a994e9671fe739ddd2243271f124e718

diff --git a/manifest.uuid b/manifest.uuid
index 5fd1f91e844e972393a4b002ec174615ef09dcc0..2f63e2e7f16e76cdcb6a6878db5f5d3aacdd11f1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7955342da4a35b57e4ae26690b8d40f7bba20e8f
\ No newline at end of file
+4c5714ab3dba19513374c7b1478221a0b90b450c
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 30ef4afb60cf2393cdbfc48bc8601eef302108ac..8f51f0e18072dbbdd6253e9729fa8778165fb972 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -7441,7 +7441,7 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
 */
 #define SQLITE_SCANSTAT_NLOOP    0
 #define SQLITE_SCANSTAT_NVISIT   1
-#define SQLITE_SCANSTAT_NEST     2
+#define SQLITE_SCANSTAT_EST      2
 #define SQLITE_SCANSTAT_NAME     3
 #define SQLITE_SCANSTAT_EXPLAIN  4
 

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index d3ba4e95d2cbf59f7b0cd84cd4fb2bddc5d4d3fc..d47200459051006e45b763c45d84632457d8c49f 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -1504,7 +1504,7 @@ int sqlite3_stmt_scanstatus(
       break;
     }
     case SQLITE_SCANSTAT_NAME: {
-      *(const char**)pOut = pScan->zName
+      *(const char**)pOut = pScan->zName;
       break;
     }
     case SQLITE_SCANSTAT_EXPLAIN: {