From: drh <drh@noemail.net>
Date: Tue, 21 Apr 2009 12:02:56 +0000 (+0000)
Subject: Remove a redundant test from sqlite3_shutdown(). (CVS 6528)
X-Git-Tag: version-3.6.15~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a76409211d794a05ef4f858d75e543a5d465c9e2;p=thirdparty%2Fsqlite.git

Remove a redundant test from sqlite3_shutdown(). (CVS 6528)

FossilOrigin-Name: 6f481ceb503c7df74d9417a5a7f019ff56261ea8
---

diff --git a/manifest b/manifest
index a30e77ac7f..1473931c6c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\soptimize\svirtual\stable\squeries\swith\s'OR'\sexpressions\sin\sthe\sWHERE\sclause.\s(CVS\s6527)
-D 2009-04-21T09:02:46
+C Remove\sa\sredundant\stest\sfrom\ssqlite3_shutdown().\s(CVS\s6528)
+D 2009-04-21T12:02:56
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in fa5998fe08bd8c0fdc7f9f66cea16c0279f39da8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -122,7 +122,7 @@ F src/insert.c 71286d081a919a27ef22eaeccbe2718f93dc6aa9
 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 2ad5b52df322d0f132f66817095e0e79c8942611
 F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc
-F src/main.c 1c68b1be781915d713d07262353c074854cd707f
+F src/main.c 81b74ada97292a09906e76d0a3c75cc37ce42a12
 F src/malloc.c a1f0f8ae110abb8eb546e259ab0eaea7e0f9b588
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c e6d5c23941288df8191b8a98c28e3f57771e2270
@@ -721,7 +721,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 419e320ae51639794335d19699f8e1189e524e7d
-R 347ea62f899ea16425c03d5a929dd221
-U danielk1977
-Z 1dd514a4d975c58998a5ffaa96ba7ca4
+P f61e4cd93682fd98bea2a71d346f9eaa68454390
+R e41290121cd78e7346039a2f88271146
+U drh
+Z feaa88976462a8a95a140c3c3f221904
diff --git a/manifest.uuid b/manifest.uuid
index d34c1b637b..a2f7e631a6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f61e4cd93682fd98bea2a71d346f9eaa68454390
\ No newline at end of file
+6f481ceb503c7df74d9417a5a7f019ff56261ea8
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index a6cdefb4ca..60dcf9e66d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.538 2009/04/19 12:23:58 drh Exp $
+** $Id: main.c,v 1.539 2009/04/21 12:02:56 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -221,9 +221,7 @@ int sqlite3_shutdown(void){
   if( sqlite3GlobalConfig.isInit ){
     sqlite3GlobalConfig.isMallocInit = 0;
     sqlite3PcacheShutdown();
-    if( sqlite3GlobalConfig.isInit ){
-      sqlite3_os_end();
-    }
+    sqlite3_os_end();
     sqlite3_reset_auto_extension();
     sqlite3MallocEnd();
     sqlite3MutexEnd();