From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 2 Apr 2007 12:29:01 +0000 (+0000)
Subject: Fix for #2281. This was a problem with the test-case only. (CVS 3795)
X-Git-Tag: version-3.6.10~2375
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd1aa9000ffb64124a7d7c60a12bb89bd96bae30;p=thirdparty%2Fsqlite.git

Fix for #2281. This was a problem with the test-case only. (CVS 3795)

FossilOrigin-Name: c036db6251ca4671fc3388a4f37955c18adeca1d
---

diff --git a/manifest b/manifest
index 492a222d46..4c86681784 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cover\sa\scorrupt-db\scase\sin\spager.c.\s(CVS\s3794)
-D 2007-04-02T12:28:28
+C Fix\sfor\s#2281.\sThis\swas\sa\sproblem\swith\sthe\stest-case\sonly.\s(CVS\s3795)
+D 2007-04-02T12:29:01
 F Makefile.in 2f2c3bf69faf0ae7b8e8af4f94f1986849034530
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -101,7 +101,7 @@ F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890
 F src/sqliteInt.h 09384eb30d6740e3e9d0c9379432e254fdb390d9
 F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06
 F src/tclsqlite.c a8d1166319db5d505b25ac6a9820162afe63fc8a
-F src/test1.c 0f94df69cd8832799aafaf58f7e28b4527225a3e
+F src/test1.c 018c5fa3d98ac4ef364f671ef3752b793585f2fe
 F src/test2.c 24458b17ab2f3c90cbc1c8446bd7ffe69be62f88
 F src/test3.c 65f92247cf8592854e9bf5115b3fb711f8b33280
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
@@ -136,7 +136,7 @@ F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test 60267b055e82de4fb8b841eabb014bc2f836a4eb
 F test/alter.test a2cc30e844cb3b5d203416962f56f78fc11b1978
-F test/alter2.test 8b2d81eae944471d473de99ab25ba6d9cda73cd3
+F test/alter2.test 33fb74e0470455ed6903f8d6e63256c7402cebb1
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
 F test/altermalloc.test 19323e0f452834044c27a54c6e78554d706de7ba
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
@@ -448,7 +448,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9c5697c70fa850ea700e8cc0c918791a1628ab10
-R 9b1809ceca03b195edbbb02502310315
+P 84077fa1602756339a262bc4ab51b6b487edc637
+R b4a7c87e67bebc1d353d9c4afaced009
 U danielk1977
-Z c0810418df79ee0e5e1bc5f565ea0ade
+Z 56dcad87d661517797c12a6081958287
diff --git a/manifest.uuid b/manifest.uuid
index 7e9678493a..20a0c43d22 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-84077fa1602756339a262bc4ab51b6b487edc637
\ No newline at end of file
+c036db6251ca4671fc3388a4f37955c18adeca1d
\ No newline at end of file
diff --git a/src/test1.c b/src/test1.c
index bdde0ff101..60498f14da 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test1.c,v 1.232 2007/03/31 15:02:49 drh Exp $
+** $Id: test1.c,v 1.233 2007/04/02 12:29:01 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -4073,6 +4073,13 @@ static void set_options(Tcl_Interp *interp){
 #else
   Tcl_SetVar2(interp, "sqlite_options", "vtab", "1", TCL_GLOBAL_ONLY);
 #endif
+
+#ifdef SQLITE_DEFAULT_FILE_FORMAT
+  Tcl_ObjSetVar2(interp, 
+      Tcl_NewStringObj("sqlite_default_file_format", -1), 0, 
+      Tcl_NewIntObj(SQLITE_DEFAULT_FILE_FORMAT), TCL_GLOBAL_ONLY
+  );
+#endif
 }
 
 /*
diff --git a/test/alter2.test b/test/alter2.test
index faa8d109c0..edf5db224a 100644
--- a/test/alter2.test
+++ b/test/alter2.test
@@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter2.test,v 1.6 2007/01/04 14:36:02 drh Exp $
+# $Id: alter2.test,v 1.7 2007/04/02 12:29:01 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -258,6 +258,7 @@ do_test alter2-4.5 {
 # Check that executing VACUUM on a file with file-format version 2
 # resets the file format to 1.
 #
+set default_file_format [expr $sqlite_default_file_format==4 ? 4 : 1]
 do_test alter2-5.1 {
   set_file_format 2
   get_file_format
@@ -269,7 +270,7 @@ do_test alter2-5.2 {
 } {}
 do_test alter2-5.3 {
   get_file_format
-} {1}
+} $default_file_format
  
 #---------------------------------------------------------------------
 # Test that when a database with file-format 2 is opened, new 
@@ -290,7 +291,7 @@ do_test alter2-6.2 {
     CREATE TABLE aux.t1(a, b);
   }
   get_file_format test2.db
-} {1}
+} $default_file_format
 do_test alter2-6.3 {
   execsql {
     CREATE TABLE t1(a, b);