From: drh <drh@noemail.net>
Date: Thu, 12 Nov 2015 23:48:08 +0000 (+0000)
Subject: Update the SQLLOG logic so that to builds in accordance with the instructions
X-Git-Tag: version-3.10.0~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e3cefe3d02dcb3bcbdda5ddce033acdf2226e06;p=thirdparty%2Fsqlite.git

Update the SQLLOG logic so that to builds in accordance with the instructions
in the header comment.

FossilOrigin-Name: ee6f2feec7d777a969ddba6dc00fb571d64e57f8
---

diff --git a/manifest b/manifest
index e33255648a..a3f6f74aa8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Always\sparse\sthe\sschema\s*before*\srunning\s"PRAGMA\scache_size",\snot\safter.
-D 2015-11-12T22:15:18.738
+C Update\sthe\sSQLLOG\slogic\sso\sthat\sto\sbuilds\sin\saccordance\swith\sthe\sinstructions\nin\sthe\sheader\scomment.
+D 2015-11-12T23:48:08.393
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -304,7 +304,7 @@ F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
-F src/main.c bf26fbebab82069cd7d15c41a58110be8075c87e
+F src/main.c 91feb5c7e393ad8f0c434754114a3493c3b0617a
 F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@ -344,7 +344,7 @@ F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830
 F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
-F src/sqliteInt.h ebd88d3a2c03440f48145a47df51f0a502bbf24e
+F src/sqliteInt.h 1b8c1b37f0bd2cec784c9f257e449f72096b37f8
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@ -1403,7 +1403,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9d532fb50d310df629ea65193f21dc9b3594ff5f
-R c87ef7443677f3561dc0db07fe8b69b1
+P 12e7d9ec023db4dd837f76006c87defc5a3e9388
+R 47faba2f3865e3275bebdbc040497572
 U drh
-Z df246221f99363b8ea6311e003f21bb5
+Z 57e0c9a039c091174e5c94cdc0c6298e
diff --git a/manifest.uuid b/manifest.uuid
index e10ef9ff00..ad235026db 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-12e7d9ec023db4dd837f76006c87defc5a3e9388
\ No newline at end of file
+ee6f2feec7d777a969ddba6dc00fb571d64e57f8
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 138626746d..9078630892 100644
--- a/src/main.c
+++ b/src/main.c
@@ -220,10 +220,10 @@ int sqlite3_initialize(void){
   if( sqlite3GlobalConfig.isInit==0 && sqlite3GlobalConfig.inProgress==0 ){
     FuncDefHash *pHash = &GLOBAL(FuncDefHash, sqlite3GlobalFunctions);
     sqlite3GlobalConfig.inProgress = 1;
-#ifdef SQLITE_INIT_SQLLOG
+#ifdef SQLITE_ENABLE_SQLLOG
     {
-      extern void SQLITE_INIT_SQLLOG(void);
-      SQLITE_INIT_SQLLOG();
+      extern void sqlite3_init_sqllog(void);
+      sqlite3_init_sqllog();
     }
 #endif
     memset(pHash, 0, sizeof(sqlite3GlobalFunctions));
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index fdd82f9915..0a1eb770f7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -527,15 +527,6 @@
 # define SQLITE_DEFAULT_PCACHE_INITSZ 100
 #endif
 
-/* 
-** If SQLITE_INIT_SQLLOG is defined, then SQLITE_ENABLE_SQLLOG is 
-** automatically defined as well.
-*/
-#if defined(SQLITE_INIT_SQLLOG) && !defined(SQLITE_ENABLE_SQLLOG)
-# define SQLITE_ENABLE_SQLLOG 1
-#endif
-
-
 /*
 ** GCC does not define the offsetof() macro so we'll have to do it
 ** ourselves.