From: danielk1977 Date: Fri, 16 Sep 2005 10:13:41 +0000 (+0000) Subject: Move the definition of sqlite3_pending_byte from test2.c to os_common.h. (CVS 2701) X-Git-Tag: version-3.6.10~3459 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2349c3d151031554dc7e36e65200eec8367daf43;p=thirdparty%2Fsqlite.git Move the definition of sqlite3_pending_byte from test2.c to os_common.h. (CVS 2701) FossilOrigin-Name: bedf702f539636fa3b65fd0d6797b087481b4613 --- diff --git a/manifest b/manifest index 32fbdb0d75..990f19eb61 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sauto-vacuum\sproblem\swith\sthe\sPENDING_BYTE\spage.\sAlso\slink\sthe\sTcl\nvariable\ssqlite_pending_byte\sto\sthe\sinternal\spending-byte\slocation\swhen\sin\stest\smode.\s(CVS\s2700) -D 2005-09-16T09:52:29 +C Move\sthe\sdefinition\sof\ssqlite3_pending_byte\sfrom\stest2.c\sto\sos_common.h.\s(CVS\s2701) +D 2005-09-16T10:13:42 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -49,7 +49,7 @@ F src/legacy.c d58ea507bce885298a2c8c3cbb0f4bff5d47830b F src/main.c bf88855445d365b497070d85e3faa0579a9edb91 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070 F src/os.h 5a0a42555a750f334b7da973776803a0e3cc263a -F src/os_common.h bd6ede01998c19dbfd3c21fbfd13f4b9532dd7df +F src/os_common.h fb2aa1b3ca31f7292e8b6e1c9420c2f825f0b1e5 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_unix.c c86cf43b7ca9200e6fb7bc202ad2cc7da2f69367 @@ -70,7 +70,7 @@ F src/sqliteInt.h cc685a74a0458bc41a34131e7c0b217654558b6c F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9 F src/tclsqlite.c ac94682f9e601dd373912c46414a5a842db2089a F src/test1.c b569b60e35f0e3ea20e5ebfaf6e522a01c08d481 -F src/test2.c f5b438bc80110ef17a248f09b58096d7d81d602e +F src/test2.c 4196848c845626e7df894470f27329e80bfe92aa F src/test3.c f4e6a16a602091696619a1171bda25c0e3df49f7 F src/test4.c a8fd681e139e1c61f22a77d07fc3a99cb28fff3f F src/test5.c 64f08b2a50ef371a1bd68ff206829e7b1b9997f5 @@ -307,7 +307,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 243f455c7c4e5c0c56406c197fa78088bc3659ca -R ae1b2d7426cc1dc2c291ee57cc0bc2b2 +P 9115e0621d1fdc5a89a0288b87c0a4ce1e4b50c6 +R a7daea377dbdbe2fe22f19ff9d88ca83 U danielk1977 -Z 374ff94d0d685dd8205cbb0751850154 +Z 396e98a623d7af55e92295f6bc6162c0 diff --git a/manifest.uuid b/manifest.uuid index 06dd7c06f6..20fc6d3952 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9115e0621d1fdc5a89a0288b87c0a4ce1e4b50c6 \ No newline at end of file +bedf702f539636fa3b65fd0d6797b087481b4613 \ No newline at end of file diff --git a/src/os_common.h b/src/os_common.h index c71bf16b5d..101a335cef 100644 --- a/src/os_common.h +++ b/src/os_common.h @@ -28,6 +28,14 @@ #endif +/* + * When testing, this global variable stores the location of the + * pending-byte in the database file. + */ +#ifdef SQLITE_TEST +unsigned int sqlite3_pending_byte = 0x0010000; +#endif + int sqlite3_os_trace = 0; #ifdef SQLITE_DEBUG static int last_page = 0; diff --git a/src/test2.c b/src/test2.c index 8f9fa02240..fa4cd329c1 100644 --- 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.33 2005/09/16 09:52:29 danielk1977 Exp $ +** $Id: test2.c,v 1.34 2005/09/16 10:13:42 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -555,10 +555,6 @@ static int fake_big_file( } #endif -#ifdef SQLITE_TEST -unsigned int sqlite3_pending_byte = 0x0010000; -#endif - /* ** Register commands with the TCL interpreter. */