From: drh <drh@noemail.net>
Date: Mon, 25 Jul 2016 11:57:21 +0000 (+0000)
Subject: If both MEMSYS3 and MEMSYS5 are enabled, than automatically disable MEMSYS3.
X-Git-Tag: version-3.14.0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d513ba08ca3b60dceb0b1223acf42ef0d443c1e;p=thirdparty%2Fsqlite.git

If both MEMSYS3 and MEMSYS5 are enabled, than automatically disable MEMSYS3.

FossilOrigin-Name: ccc22e14dc5d910d632807f49484be54dc2fde83
---

diff --git a/configure b/configure
index 85d56a1ede..fbcf7309b1 100755
--- a/configure
+++ b/configure
@@ -903,8 +903,8 @@ with_readline_inc
 enable_debug
 enable_amalgamation
 enable_load_extension
-enable_memsys3
 enable_memsys5
+enable_memsys3
 enable_fts3
 enable_fts4
 enable_fts5
@@ -1554,8 +1554,8 @@ Optional Features:
                           separately
   --disable-load-extension
                           Disable loading of external extensions
-  --enable-memsys3        Enable MEMSYS3
   --enable-memsys5        Enable MEMSYS5
+  --enable-memsys3        Enable MEMSYS3
   --enable-fts3           Enable the FTS3 extension
   --enable-fts4           Enable the FTS4 extension
   --enable-fts5           Enable the FTS5 extension
@@ -11346,34 +11346,34 @@ fi
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
-# Check whether --enable-memsys3 was given.
-if test "${enable_memsys3+set}" = set; then :
-  enableval=$enable_memsys3; enable_memsys3=yes
+# Check whether --enable-memsys5 was given.
+if test "${enable_memsys5+set}" = set; then :
+  enableval=$enable_memsys5; enable_memsys5=yes
 else
-  enable_memsys3=no
+  enable_memsys5=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
-$as_echo_n "checking whether to support MEMSYS3... " >&6; }
-if test "${enable_memsys3}" = "yes"; then
-  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
+$as_echo_n "checking whether to support MEMSYS5... " >&6; }
+if test "${enable_memsys5}" = "yes"; then
+  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-# Check whether --enable-memsys5 was given.
-if test "${enable_memsys5+set}" = set; then :
-  enableval=$enable_memsys5; enable_memsys5=yes
+# Check whether --enable-memsys3 was given.
+if test "${enable_memsys3+set}" = set; then :
+  enableval=$enable_memsys3; enable_memsys3=yes
 else
-  enable_memsys5=no
+  enable_memsys3=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5
-$as_echo_n "checking whether to support MEMSYS5... " >&6; }
-if test "${enable_memsys5}" = "yes"; then
-  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5
+$as_echo_n "checking whether to support MEMSYS3... " >&6; }
+if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
+  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
diff --git a/configure.ac b/configure.ac
index 07dd3cb88a..c9e3af9220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -591,16 +591,6 @@ fi
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
-AC_ARG_ENABLE(memsys3, 
-  AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
-  [enable_memsys3=yes],[enable_memsys3=no])
-AC_MSG_CHECKING([whether to support MEMSYS3])
-if test "${enable_memsys3}" = "yes"; then
-  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
 AC_ARG_ENABLE(memsys5, 
   AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
   [enable_memsys5=yes],[enable_memsys5=no])
@@ -611,6 +601,16 @@ if test "${enable_memsys5}" = "yes"; then
 else
   AC_MSG_RESULT([no])
 fi
+AC_ARG_ENABLE(memsys3, 
+  AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
+  [enable_memsys3=yes],[enable_memsys3=no])
+AC_MSG_CHECKING([whether to support MEMSYS3])
+if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
+  OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
 
 #########
 # See whether we should enable Full Text Search extensions
diff --git a/manifest b/manifest
index 8310f7e4f2..6a45ebc22e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\sattempt\sat\sgetting\s--enable-memsysN\sworking.
-D 2016-07-25T11:39:24.067
+C If\sboth\sMEMSYS3\sand\sMEMSYS5\sare\senabled,\sthan\sautomatically\sdisable\sMEMSYS3.
+D 2016-07-25T11:57:21.222
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -30,8 +30,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure f62e6614b26418ce81392b2c28b2a6cf268f1d5d x
-F configure.ac 83c4e53031a3582d0b9200dcb3700189a24f1b1c
+F configure 35ce04a15ca046262bf9baaa2ced9337708cc653 x
+F configure.ac b5d3df43161374f8dffd2e5f4b88fbb51685b975
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html e2118945e5f07ed146b45c9cd2b2dd6eabb8ebf2
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -388,7 +388,7 @@ F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
 F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
-F src/sqliteInt.h 48cd97eb134665348393dfe277b4c14d1085bfc7
+F src/sqliteInt.h 49081ceab08eda9943d555aee57392c5b35d1c60
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@ -1009,7 +1009,7 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test aa7ffcc21350007a78361b82bcf3b74d12227144
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 7d80014d0245b3f9d02d393d420bf03ca155aec0
+F test/releasetest.tcl 3a66c7b8fbe55bcd97c907217c3d812d1d3c6b93
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
@@ -1507,7 +1507,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 679552550e085497b98478bbe28056d99fe4aab4
-R 5c303973b5bb214411149d73b1469581
+P 5f40e6ad599eea59a5adc3a11d6f7998872736b4
+R b01daae186a7f9a051c9362d4aae0591
 U drh
-Z 6145af1bb509746e3a2a7850c862eafe
+Z d2602db348bfa53fd2c4a084ddf1dc40
diff --git a/manifest.uuid b/manifest.uuid
index 8d55876e78..9bc4c35374 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f40e6ad599eea59a5adc3a11d6f7998872736b4
\ No newline at end of file
+ccc22e14dc5d910d632807f49484be54dc2fde83
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0be4947513..879e6703ca 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3440,11 +3440,15 @@ int sqlite3HeapNearlyFull(void);
 # define sqlite3StackFree(D,P)       sqlite3DbFree(D,P)
 #endif
 
-#ifdef SQLITE_ENABLE_MEMSYS3
-const sqlite3_mem_methods *sqlite3MemGetMemsys3(void);
-#endif
+/* Do not allow both MEMSYS5 and MEMSYS3 to be defined together.  If they
+** are, disable MEMSYS3
+*/
 #ifdef SQLITE_ENABLE_MEMSYS5
 const sqlite3_mem_methods *sqlite3MemGetMemsys5(void);
+#undef SQLITE_ENABLE_MEMSYS3
+#endif
+#ifdef SQLITE_ENABLE_MEMSYS3
+const sqlite3_mem_methods *sqlite3MemGetMemsys3(void);
 #endif
 
 
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 2961fc385d..e13a3d7340 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -120,7 +120,6 @@ array set ::Configs [strip_comments {
     -DSQLITE_ENABLE_FTS3=1
     -DSQLITE_ENABLE_RTREE=1
     -DSQLITE_ENABLE_MEMSYS5=1
-    -DSQLITE_ENABLE_MEMSYS3=1
     -DSQLITE_ENABLE_COLUMN_METADATA=1
     -DSQLITE_ENABLE_STAT4
     -DSQLITE_ENABLE_HIDDEN_COLUMNS