Make the default TEMP_STORE=1 (TEMP tables stored on disk) in the configure

script. (CVS 2748)

FossilOrigin-Name: 9753af53494a14f7300f92f3d94e4ceb55619529

diff --git a/configure b/configure
index e90a4e25816ce66db5c73aeb49debfc8e218d224..5be315aac0294712681a679da179877089031186 100755 (executable)
--- a/configure
+++ b/configure
@@ -1496,7 +1496,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.33 $
+# $Revision: 1.34 $
 
 #########
 # Programs needed
@@ -19530,7 +19530,7 @@ if test "${enable_tempstore+set}" = set; then
   enableval="$enable_tempstore"
 
 else
-  enable_tempstore=yes
+  enable_tempstore=no
 fi;
 echo "$as_me:$LINENO: checking whether to use an in-ram database for temporary tables" >&5
 echo $ECHO_N "checking whether to use an in-ram database for temporary tables... $ECHO_C" >&6
@@ -19548,10 +19548,15 @@ echo "${ECHO_T}no" >&6
   always )
      TEMP_STORE=3
     echo "$as_me:$LINENO: result: always" >&5
+echo "${ECHO_T}always" >&6
+  ;;
+  yes )
+     TEMP_STORE=3
+    echo "$as_me:$LINENO: result: always" >&5
 echo "${ECHO_T}always" >&6
   ;;
   * )
-    TEMP_STORE=2
+    TEMP_STORE=1
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ;;

diff --git a/configure.ac b/configure.ac
index e230288bae02fd9fdbc31dfbe479c97891321b3e..8ed6baa6d568bfee9a3eaee10dd3e6bbeb3c9e5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@ AC_INIT(src/sqlite.h.in)
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.19 $
+# $Revision: 1.20 $
 
 #########
 # Programs needed
@@ -318,7 +318,7 @@ AC_SUBST(ALLOWRELEASE)
 # Do we want temporary databases in memory
 #
 AC_ARG_ENABLE(tempstore, 
-[  --enable-tempstore     Use an in-ram database for temporary tables (never,no,yes,always)],,enable_tempstore=yes)
+[  --enable-tempstore     Use an in-ram database for temporary tables (never,no,yes,always)],,enable_tempstore=no)
 AC_MSG_CHECKING([whether to use an in-ram database for temporary tables])
 case "$enable_tempstore" in
   never ) 
@@ -333,8 +333,12 @@ case "$enable_tempstore" in
      TEMP_STORE=3
     AC_MSG_RESULT([always])
   ;;
+  yes ) 
+     TEMP_STORE=3
+    AC_MSG_RESULT([always])
+  ;;
   * ) 
-    TEMP_STORE=2
+    TEMP_STORE=1
     AC_MSG_RESULT([yes])
   ;;
 esac

diff --git a/manifest b/manifest
index e53c53ae5a638af88390b65905ead5474f751637..48492a4064046e24cc6e6f65e331e77775db32a1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sefficient\shandling\sof\sthe\sLIMIT\sclause.\s\sScalar\ssubqueries\sand\sEXISTS\non\scompound\sSELECT\sstatements\snow\sworking\sproperly.\s\sTicket\s#1473.\s(CVS\s2747)
-D 2005-10-06T16:53:15
+C Make\sthe\sdefault\sTEMP_STORE=1\s(TEMP\stables\sstored\son\sdisk)\sin\sthe\sconfigure\nscript.\s(CVS\s2748)
+D 2005-10-10T00:05:51
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -11,8 +11,8 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
 F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
 F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
 F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
-F configure 91136fc4891444dc6312f3af90217fcce3d89d75 x
-F configure.ac ab85efcbdbbf3389908fc6294b82f233e8f85165
+F configure 32b90b38561fe7182d060e390e3fcd1d42a3f357 x
+F configure.ac e2d025ec2a3fbb33324f37695403b0220cda8784
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -315,7 +315,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4862eaafd875eb1069076864c7cad600a76620c7
-R 24aa61823d2322d621f097e15a448b5d
+P edca8913ca012fc0c17343a27f819de95147b1bd
+R 4311fd59747207ae5450fbdb06f917f3
 U drh
-Z e25e42a04ed4277adccd254634ad3dc4
+Z 4013be90cb59b45ffcbc0935306d8882

diff --git a/manifest.uuid b/manifest.uuid
index 0598cb0fe5d17d5e27f0e70398d9e615671f10e6..88b56872816807da5a3988541c39fe62e86f887c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-edca8913ca012fc0c17343a27f819de95147b1bd
\ No newline at end of file
+9753af53494a14f7300f92f3d94e4ceb55619529
\ No newline at end of file