Minor changes to help build and test SSE. (CVS 2487)

FossilOrigin-Name: 3ac4a212bd70abb94d24830c73f7121df51125c7

diff --git a/manifest b/manifest
index f302ce885b6aad86a3b73a9ed3e5322f9634671a..c5e25363c12046cfe4989925df5087d189dece21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sexperimental\ssqlite3_get_autocommit()\sAPI\sused\sto\stest\swhether\sor\snot\nchanges\sare\scommitted\sautomatically.\s(CVS\s2486)
-D 2005-05-26T16:23:34
+C Minor\schanges\sto\shelp\sbuild\sand\stest\sSSE.\s(CVS\s2487)
+D 2005-05-27T09:41:13
 F Makefile.in 8129e7f261d405db783676f9ca31e0841768c652
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -66,8 +66,8 @@ F src/sqlite.h.in f28f5b018f03a66aaf0bc1ab6985d8605d6b964f
 F src/sqliteInt.h 0de60fafa8d9a15b03b4ed2cfbc2372a5b259295
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c af0f002d9d6ab4f7f32b9bee5b57665946e76ad9
-F src/test1.c 6a8943111d63b31433be49d9f9f7bee796ef12e1
-F src/test2.c 7f0ef466706ac01414e1136b96e5d8a65cb97545
+F src/test1.c ad04983979a8ee4c05d407bca8575ba1fecca0e3
+F src/test2.c 716c1809dba8e5be6093703e9cada99d627542dc
 F src/test3.c 683e1e3819152ffd35da2f201e507228921148d0
 F src/test4.c 7c6b9fc33dd1f3f93c7f1ee6e5e6d016afa6c1df
 F src/test5.c 64f08b2a50ef371a1bd68ff206829e7b1b9997f5
@@ -81,7 +81,7 @@ F src/vdbe.c 15b12cdaeb5096257143a00f466a00eed6137d2e
 F src/vdbe.h 75e466d84d362b0c4498978a9d6b1e6bd32ecf3b
 F src/vdbeInt.h 4afaae2f4adcab54ad2a40dabb2e689fba7b1561
 F src/vdbeapi.c c66b88fce58f72eee44ec8c348a2561e031d2417
-F src/vdbeaux.c 73b1198632eaa755453902b2ddb11912225a6e9d
+F src/vdbeaux.c 84a1381023e808761d6462871ef9bd46392c5c4f
 F src/vdbemem.c 48a64ae95a9edc6e8d940300dad15d70d1670398
 F src/where.c f02baff03e2a9ed7bdc36b363b8e4024a94de919
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
@@ -124,7 +124,7 @@ F test/corrupt2.test 88342570828f2b8cbbd8369eff3891f5c0bdd5ba
 F test/crash.test f38b980a0508655d08c957a6dd27d66bca776504
 F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
 F test/date.test 30ca15e608a45d868fd419c901795382efe27020
-F test/delete.test fc29491f6a7ac899ce29f4549a104809e245d9a6
+F test/delete.test 33e1670049364fc3604217a6c2eda042a47115ab
 F test/delete2.test e382b6a97787197eb8b93dd4ccd37797c3725ea3
 F test/diskfull.test e2f6cfd868713ead06dc82b84a4938e868128fc0
 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P b0a898c05a2285c87d7da4d47dd697c58a0d4d58
-R 113e24d04585bd6cfafaa3cb61125259
-U drh
-Z f82135b994cfa2d26c1f56d5cdbaf4d2
+P 4a7f1275857602e3841ccb2d43a5c4d3d3e87bff
+R 04dd66eb49a58341bbd38031616ec847
+U danielk1977
+Z 6b2e9ec035bd8b7d47e24336173c1c39

diff --git a/manifest.uuid b/manifest.uuid
index 0a7b5afaab67d50dae20d97f6af4b5cc4232e8f8..134d10a35378ec8d22997c148c908fa9f53e1832 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a7f1275857602e3841ccb2d43a5c4d3d3e87bff
\ No newline at end of file
+3ac4a212bd70abb94d24830c73f7121df51125c7
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 862706208cfbeed9f3befaad244a7f43eb90505b..1e6257e283a17a5591d99b7e2c20ff300b83e000 100644 (file)
--- 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.139 2005/05/26 16:23:34 drh Exp $
+** $Id: test1.c,v 1.140 2005/05/27 09:41:13 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -2407,6 +2407,7 @@ static int test_stmt_int(
   return TCL_OK;
 }
 
+#ifndef SQLITE_OMIT_DISKIO
 /*
 ** Usage:  sqlite3OsOpenReadWrite <filename>
 */
@@ -2566,6 +2567,7 @@ static int test_sqlite3OsTempFileName(
   Tcl_AppendResult(interp, zFile, 0);
   return TCL_OK;
 }
+#endif
 
 /*
 ** Usage:  sqlite_set_magic  DB  MAGIC-NUMBER
@@ -3049,6 +3051,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_global_recover",    test_global_recover, 0   },
 
      /* Functions from os.h */
+#ifndef SQLITE_OMIT_DISKIO
      { "sqlite3OsOpenReadWrite",test_sqlite3OsOpenReadWrite, 0 },
      { "sqlite3OsClose",        test_sqlite3OsClose, 0 },
      { "sqlite3OsLock",         test_sqlite3OsLock, 0 },
@@ -3056,6 +3059,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
    
      /* Custom test interfaces */
      { "sqlite3OsUnlock",         test_sqlite3OsUnlock, 0    },
+#endif
 #ifndef SQLITE_OMIT_UTF16
      { "add_test_collate",        test_collate, 0            },
      { "add_test_collate_needed", test_collate_needed, 0     },

diff --git a/src/test2.c b/src/test2.c
index e77f2f25765934f0bb67890f70159c2ae6ab5343..4351e6c0b1c7ac41f531ad303fb8c27ffb1892d6 100644 (file)
--- a/src/test2.c
+++ b/src/test2.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test2.c,v 1.29 2005/02/06 02:45:43 drh Exp $
+** $Id: test2.c,v 1.30 2005/05/27 09:41:13 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -508,6 +508,7 @@ static int page_write(
   return TCL_OK;
 }
 
+#ifndef SQLITE_OMIT_DISKIO
 /*
 ** Usage:   fake_big_file  N  FILENAME
 **
@@ -555,6 +556,7 @@ static int fake_big_file(
   }
   return TCL_OK;
 }
+#endif
 
 /*
 ** Register commands with the TCL interpreter.
@@ -582,7 +584,9 @@ int Sqlitetest2_Init(Tcl_Interp *interp){
     { "page_write",              (Tcl_CmdProc*)page_write          },
     { "page_number",             (Tcl_CmdProc*)page_number         },
     { "pager_truncate",          (Tcl_CmdProc*)pager_truncate      },
+#ifndef SQLITE_OMIT_DISKIO
     { "fake_big_file",           (Tcl_CmdProc*)fake_big_file       },
+#endif
   };
   int i;
   for(i=0; i<sizeof(aCmd)/sizeof(aCmd[0]); i++){

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index db619f35d326cfc0bd47b53975afbb6660e1a6fb..be157a3c40ef673f06ef8f3bff10ec62a3fdcb52 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1110,6 +1110,7 @@ static int vdbeCommit(sqlite3 *db){
   ** This requires a master journal file to ensure the transaction is
   ** committed atomicly.
   */
+#ifndef SQLITE_OMIT_DISKIO
   else{
     char *zMaster = 0;   /* File-name for the master journal */
     char const *zMainFile = sqlite3BtreeGetFilename(db->aDb[0].pBt);
@@ -1226,6 +1227,7 @@ static int vdbeCommit(sqlite3 *db){
       }
     }
   }
+#endif
 
   return rc;
 }

diff --git a/test/delete.test b/test/delete.test
index d582bcf960f74c25e9acf4c1b2e77ba9074bb978..3ce7e61cf80db003544f78844bd19835fee6c83c 100644 (file)
--- a/test/delete.test
+++ b/test/delete.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the DELETE FROM statement.
 #
-# $Id: delete.test,v 1.18 2004/11/04 04:42:28 drh Exp $
+# $Id: delete.test,v 1.19 2005/05/27 09:41:13 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -274,7 +274,7 @@ do_test delete-8.0 {
 db close
 catch {file attributes test.db -permissions 0444}
 catch {file attributes test.db -readonly 1}
-sqlite3 db test.db
+set ::DB [sqlite3 db test.db]
 do_test delete-8.1 {
   catchsql {
     DELETE FROM t3;