From: drh <drh@noemail.net>
Date: Fri, 26 Feb 2010 15:39:24 +0000 (+0000)
Subject: Remove the compile_option pragma (retaining compile_options - with an "s").
X-Git-Tag: version-3.7.2~570
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71caabf0cc0c163472cd59c13fd7b96de64e171e;p=thirdparty%2Fsqlite.git

Remove the compile_option pragma (retaining compile_options - with an "s").
Updates to documentation.

FossilOrigin-Name: 733778df996a2dda7c31ff7b544cb6f9a6ed4c97
---

diff --git a/manifest b/manifest
index 3dbc1246f5..16b8c54fa9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Avoid\sa\sbuffer\soverwrite\sthat\scan\soccur\swith\sa\scorrupt\sdatabase\sif\ssecure-delete\sis\senabled.
-D 2010-02-26T15:09:20
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\sthe\scompile_option\spragma\s(retaining\scompile_options\s-\swith\san\s"s").\nUpdates\sto\sdocumentation.
+D 2010-02-26T15:39:24
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -158,7 +161,7 @@ F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 815bcb3cf0e14b23212efd3f4981f667a5fd633e
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
-F src/pragma.c d610d4f4fc55dca58919890fb5323d441b385362
+F src/pragma.c 56d95f76154a5f873c32eae485bb625f3c70be46
 F src/prepare.c c80630169d82945070a50ebf298611fd9f1485f1
 F src/printf.c aa793722d793520fa31c54d81ddab26b0b410562
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -166,7 +169,7 @@ F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 4113ef360430ed4e7533690ef46d06c20204adce
 F src/shell.c 31cd555125a1fda4a6d8dce019690f043a8e5d75
-F src/sqlite.h.in 336ed7bab1080e7e63d5fc48e39bd3fa995da6f0
+F src/sqlite.h.in 8793d52e7d4e1124dc3cc94ff56376a97b67965f
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 32e6eb47d2f6fad587e16b0abbbfe3f7d55f2ec0
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
@@ -792,7 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8f29490da62df07ea922b03cab52b6edd2669edb
-R 7b8c852b73b99027be1973f856f673bb
-U dan
-Z 2b638b55505849de93efc222bb43dd70
+P 7bdb1e05faceddbb0b8e3efee7d070ad8c4611a3
+R 166632f05beccd6e33784984b6d9675d
+U drh
+Z ed08651f41dc2c7225f33203915e8063
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFLh+svoxKgR168RlERArQvAJ95o9BxgjMp3G3ev6cCRTv/xZJZmgCdEowj
+KQEVfyphDS5oiwkCBBNOI7Q=
+=1Xz8
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 683efb2340..c0089ea99e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7bdb1e05faceddbb0b8e3efee7d070ad8c4611a3
\ No newline at end of file
+733778df996a2dda7c31ff7b544cb6f9a6ed4c97
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 9a72d643c6..bd96e47c18 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1363,18 +1363,10 @@ void sqlite3Pragma(
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
   /*
   **   PRAGMA compile_options
-  **   PRAGMA compile_option(<option>)
   **
-  ** The first form returns a single row for each option that was 
-  ** defined at compile time.  The second form returns 0 or 1 
-  ** indicating whether the specified option was defined at 
-  ** compile time.
+  ** Return the names of all compile-time options used in this build,
+  ** one option per row.
   */
-  if( sqlite3StrICmp(zLeft, "compile_option")==0 && zRight ){
-    int used = sqlite3_compileoption_used(zRight);
-    returnSingleInt(pParse, zRight, used);
-  }else
-
   if( sqlite3StrICmp(zLeft, "compile_options")==0 ){
     int i = 0;
     const char *zOpt;
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 178824b8e3..b23cf97782 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -141,9 +141,9 @@ const char *sqlite3_libversion(void);
 const char *sqlite3_sourceid(void);
 int sqlite3_libversion_number(void);
 
+#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
 /*
 ** CAPI3REF: Run-Time Library Compilation Options Diagnostics
-** KEYWORDS: sqlite3_compileoption_used, sqlite3_compileoption_get
 **
 ** ^The sqlite3_compileoption_used() function returns 0 or 1 
 ** indicating whether the specified option was defined at 
@@ -159,11 +159,11 @@ int sqlite3_libversion_number(void);
 **
 ** ^Support for the diagnostic functions sqlite3_compileoption_used()
 ** and sqlite3_compileoption_get() may be omitted by specifing the 
-** SQLITE_OMIT_COMPILEOPTION_DIAGS option at compile time.
+** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
 **
-** See also: [sqlite_compile_option_used()] and [sqlite_compile_option_get()].
+** See also: SQL functions [sqlite_compileoption_used()] and
+** [sqlite_compileoption_get()] and the [compile_options pragma].
 */
-#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
 int sqlite3_compileoption_used(const char *zOptName);
 const char *sqlite3_compileoption_get(int N);
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
@@ -5695,7 +5695,7 @@ int sqlite3_strnicmp(const char *, const char *, int);
 ** EXPERIMENTAL
 **
 ** ^The [sqlite3_log()] interface writes a message into the error log
-** established by the [SQLITE_CONFIG_ERRORLOG] option to [sqlite3_config()].
+** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
 ** ^If logging is enabled, the zFormat string and subsequent arguments are
 ** passed through to [sqlite3_vmprintf()] to generate the final output string.
 **