Revise when the sqlite3ErrName() function is defined.

FossilOrigin-Name: 9e593fb3dbc58e86f499ba4399530e3e760eb84d

diff --git a/manifest b/manifest
index d72c37561fa610760268f217f80e0caf73b5b747..8adcf63f4da7ff7ea2fd43201ff6d68c38a89c09 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restore\sSQLITE_FORCE_OS_TRACE\sto\sthe\sMSVC\smakefile,\swhich\swas\sremoved\sduring\sa\smerge.
-D 2015-04-16T16:27:29.786
+C Revise\swhen\sthe\ssqlite3ErrName()\sfunction\sis\sdefined.
+D 2015-04-28T23:34:10.625
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
-F src/main.c 9f4b0e0924cd1be1c7766290bf3f9c98b97f32b7
+F src/main.c 6dc030204d80be177578210a90c912e1d9597126
 F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@ -235,7 +235,7 @@ F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb
 F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h 1b6087a8e82c3e5bf3acfbf0fe144519df7cecc8
+F src/sqliteInt.h 5a4e0ae0ce02acb1cadb783abd70af800f538cba
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@ -1250,7 +1250,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 72485c97c6de47b8bba63b2a307e7bdeea114040
-R 59a3cad2ebc56d9746b8d39612e405b8
+P c37f4d492f98ac5c07c08705a3826a3e86107306
+R f96d406cf134e6be926fdb343dc33ea3
 U mistachkin
-Z ed5465cd174207b2ad19d34d3cae09df
+Z 0af972753cfc85d551aad5ddaa27fa03

diff --git a/manifest.uuid b/manifest.uuid
index 9949a6e131b8a2759495d710be2d3de5587eb6fc..fc8716e2eabd13bd10e5c0a95078769fc8fb9644 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c37f4d492f98ac5c07c08705a3826a3e86107306
\ No newline at end of file
+9e593fb3dbc58e86f499ba4399530e3e760eb84d
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 27a0fe58d827a78dd3b8cf0fc31988da07062af2..ff5a1061b382537a4f70a51dd2283f9751be7aaa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1206,7 +1206,7 @@ void sqlite3RollbackAll(sqlite3 *db, int tripCode){
 ** Return a static string containing the name corresponding to the error code
 ** specified in the argument.
 */
-#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE)
+#if defined(SQLITE_NEED_ERR_NAME)
 const char *sqlite3ErrName(int rc){
   const char *zName = 0;
   int i, origRc = rc;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 56fd2e14fa04124431d889eb171b7cc55a3fefca..5a393b27d13f34def26a163d16a4dfd65b519bd6 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -375,6 +375,19 @@
 # undef  SQLITE_HAVE_OS_TRACE
 #endif
 
+/*
+** Is the sqlite3ErrName() function needed in the build?  Currently,
+** it is needed by "mutex_w32.c" (when debugging), "os_win.c" (when
+** OSTRACE is enabled), and by several "test*.c" files (which are
+** compiled using SQLITE_TEST).
+*/
+#if defined(SQLITE_HAVE_OS_TRACE) || defined(SQLITE_TEST) || \
+    (defined(SQLITE_DEBUG) && SQLITE_OS_WIN)
+# define SQLITE_NEED_ERR_NAME
+#else
+# undef  SQLITE_NEED_ERR_NAME
+#endif
+
 /*
 ** Return true (non-zero) if the input is an integer that is too large
 ** to fit in 32-bits.  This macro is used inside of various testcase()
@@ -3506,7 +3519,7 @@ void *sqlite3HexToBlob(sqlite3*, const char *z, int n);
 u8 sqlite3HexToInt(int h);
 int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);
 
-#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE)
+#if defined(SQLITE_NEED_ERR_NAME)
 const char *sqlite3ErrName(int);
 #endif