From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 8 Jul 2008 14:17:35 +0000 (+0000)
Subject: Fix a compilation bug with SQLITE_OMIT_AUTOINIT. (CVS 5366)
X-Git-Tag: version-3.6.10~811
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00f0faf3ac45bacce4a37bc15422397fd3deca88;p=thirdparty%2Fsqlite.git

Fix a compilation bug with SQLITE_OMIT_AUTOINIT. (CVS 5366)

FossilOrigin-Name: 94c95fad56965b68176e93f0690f0819ad40bcf7
---

diff --git a/manifest b/manifest
index eab84b27d9..f8af8a29b0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extra\scoverage\stests\sfor\sbtree.c.\s(CVS\s5365)
-D 2008-07-08T12:07:33
+C Fix\sa\scompilation\sbug\swith\sSQLITE_OMIT_AUTOINIT.\s(CVS\s5366)
+D 2008-07-08T14:17:35
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -113,7 +113,7 @@ F src/hwtime.h 745961687a65ef8918cd551c02e5ccb4b8e772de
 F src/insert.c 9af927a81fdc99624130dc83722b3ab6364035a6
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
-F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
+F src/loadext.c ae0eed9fa96d74172d2a90ee63b5bc36d284295c
 F src/main.c 9d5efc560928db31c20475b5784191654e660538
 F src/malloc.c f52166df8abd7ff6990dbee1a0ce3534addc8617
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
@@ -163,7 +163,7 @@ F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
 F src/test_config.c e893a7195e975f133c4481d679089531c2970c73
 F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
-F src/test_func.c dfa828142be4c7bebe5c97f94dee192f0cd664f4
+F src/test_func.c ade4f0117cc96c5a05682e1ef38b84320a866ad9
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_loadext.c df8ab3a6481ddebbdf0d28ebac5d9e0790f7860f
 F src/test_malloc.c 62296810d3ee914fc3e05f2a8a69d8f8f42c32e1
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d725d3bbcef6a8093a246f8ef5b11bf690662393
-R 2d58858c5c3c471f74dd32d87ed3a2e9
+P 08334f60303e63b581fa7f1f00d3e8833f1710ca
+R 8ac86c826f8b10e2f30647de3f8c697e
 U danielk1977
-Z b7d05440ff0333183f3b4e3b23e508a6
+Z 600225b33fecb70d6a161959c7da01bc
diff --git a/manifest.uuid b/manifest.uuid
index d84e11beca..95d8af7477 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08334f60303e63b581fa7f1f00d3e8833f1710ca
\ No newline at end of file
+94c95fad56965b68176e93f0690f0819ad40bcf7
\ No newline at end of file
diff --git a/src/loadext.c b/src/loadext.c
index 23d3d0423b..b9b47b6ed3 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -12,7 +12,7 @@
 ** This file contains code used to dynamically load extensions into
 ** the SQLite library.
 **
-** $Id: loadext.c,v 1.50 2008/06/19 15:06:24 drh Exp $
+** $Id: loadext.c,v 1.51 2008/07/08 14:17:35 danielk1977 Exp $
 */
 
 #ifndef SQLITE_CORE
@@ -478,8 +478,9 @@ static struct {
 ** loaded by every new database connection.
 */
 int sqlite3_auto_extension(void *xInit){
+  int rc = SQLITE_OK;
 #ifndef SQLITE_OMIT_AUTOINIT
-  int rc = sqlite3_initialize();
+  rc = sqlite3_initialize();
   if( rc ){
     return rc;
   }else
diff --git a/src/test_func.c b/src/test_func.c
index 6bfad61ab9..3704552859 100644
--- a/src/test_func.c
+++ b/src/test_func.c
@@ -12,7 +12,7 @@
 ** Code for testing all sorts of SQLite interfaces.  This code
 ** implements new SQL functions used by the test scripts.
 **
-** $Id: test_func.c,v 1.6 2008/07/07 14:50:14 drh Exp $
+** $Id: test_func.c,v 1.7 2008/07/08 14:17:35 danielk1977 Exp $
 */
 #include "sqlite3.h"
 #include "tcl.h"
@@ -387,6 +387,7 @@ int Sqlitetest_func_Init(Tcl_Interp *interp){
   for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
     Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, 0, 0);
   }
+  sqlite3_initialize();
   sqlite3_auto_extension((void*)registerTestFunctions);
   return TCL_OK;
 }