From: drh <drh@noemail.net>
Date: Fri, 17 Feb 2017 23:52:00 +0000 (+0000)
Subject: Fix the #endif location for an #ifndef SQLITE_UNTESTABLE macro in the
X-Git-Tag: version-3.18.0~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f196972c73caf56506e570818d16d024963d5b5f;p=thirdparty%2Fsqlite.git

Fix the #endif location for an #ifndef SQLITE_UNTESTABLE macro in the
command-line shell.

FossilOrigin-Name: 8cc9d74c176a78aeebfbb39198c21b5dd547ff52
---

diff --git a/manifest b/manifest
index dc0eaa5c63..f6dcc6d61d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\scase\sthat\swas\smade\sto\sfail\sby\sthe\sLIKE\soptimization\senhancement\nin\scheck-in\s[158290c0ab]\sbut\swhich\swent\sunnoticed\sbecause\stest\sbuilds\swere\nrunning\swith\sICU\senabled\sand\sICU\sdisables\sthe\sLIKE\soptimization.
-D 2017-02-17T02:04:31.068
+C Fix\sthe\s#endif\slocation\sfor\san\s#ifndef\sSQLITE_UNTESTABLE\smacro\sin\sthe\ncommand-line\sshell.
+D 2017-02-17T23:52:00.611
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -395,7 +395,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
-F src/shell.c bb8e20789499aec921a01d8744c616b81b8214f1
+F src/shell.c bf976d5301be9d8a4c52852c97909cc9a41ee20d
 F src/sqlite.h.in 751ff125eb159c8f92c182b8df980a5e4f50e966
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1556,7 +1556,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 8a03be1dc42737ba0712d33f639ea26dc243b20e
-R b29803fdd4fd514ba7baa53a58b26311
+P 218b2bbb0de07288889f6762d4461ea8acd78969
+R ac73be2e300a373fc7f110abc87089ba
 U drh
-Z af65459984ca8c135fabce3c62812860
+Z 57022d1bdb1e12a8cd90064785570f14
diff --git a/manifest.uuid b/manifest.uuid
index d642d67abe..ce8096c87e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-218b2bbb0de07288889f6762d4461ea8acd78969
\ No newline at end of file
+8cc9d74c176a78aeebfbb39198c21b5dd547ff52
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index fbbbea9d79..f1c7f3c157 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -5192,6 +5192,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       }
     }
   }else
+#endif /* !defined(SQLITE_UNTESTABLE) */
 
   if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
     open_db(p, 0);
@@ -5228,7 +5229,6 @@ static int do_meta_command(char *zLine, ShellState *p){
     }
 #endif
   }else
-#endif /* !defined(SQLITE_UNTESTABLE) */
 
 #if SQLITE_USER_AUTHENTICATION
   if( c=='u' && strncmp(azArg[0], "user", n)==0 ){