diff --git a/manifest b/manifest index 526fd97ae6..7b06c0ffa5 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Merge\sthe\scompile-time\soption\sintrospection\sinterfaces\sinto\sthe\strunk. -D 2010-02-23T20:32:15 +C Fix\sthe\sstmt.test\stest\sscript\sso\sthat\sit\sworks\swith\sSQLITE_TEMP_STORE=3. +D 2010-02-23T21:08:41 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -588,7 +588,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b F test/sqllimits1.test e90a0ed94452076f6a10209d378e06b5f75ef0a0 -F test/stmt.test 877d41d41bfbbf27365b4e498c4b5b4b4d61818d +F test/stmt.test ac97e59879fd3bd52ecd60ef4efb03ba16292829 F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a @@ -794,14 +794,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P edea3bb740ddd096a46e00678b59d465bb1e2903 76a0294ab4208a0858a13bab0858e1bc1448b651 -R b35175023051c7d34a934eed9c09fecc +P 9f429434c0404f03a3e5c6741b769afe98a5c6c9 +R bde76a4d1143f986e520d9d13648dec0 U drh -Z b813deaa3c8e80f7d379ad8d205f30b4 +Z 0edbafdd674ccf625fff856abe89b43e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD4DBQFLhDtToxKgR168RlERAiIJAJ4sxDb50Ahh6anzP0DgFOww+gn3JgCYoVgL -XxKHjRo8pYgc4TchsfsZyA== -=0chk +iD8DBQFLhEPdoxKgR168RlERAtn2AJ9MgEQumymw12j/wVK7twO3+yl+LACfcJCz +zJFAoZng83uA0nnQGrI10GM= +=jzra -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 44df1fea59..75d7d99d77 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9f429434c0404f03a3e5c6741b769afe98a5c6c9 \ No newline at end of file +8bf710ce6dfab0e6fd4de7d6d3157008cc70d192 \ No newline at end of file diff --git a/test/stmt.test b/test/stmt.test index 56faa896d6..45e9ac5371 100644 --- a/test/stmt.test +++ b/test/stmt.test @@ -24,6 +24,12 @@ do_test stmt-1.1 { # that if a statement journal is required by a statement it is opened and # remains open until the current transaction is committed or rolled back. # +# This only work if SQLITE_TEMP_STORE!=3 +# +if {$::TEMP_STORE==3} { + finish_test + return +} do_test stmt-1.2 { set sqlite_open_file_count } {1} @@ -77,4 +83,3 @@ do_test stmt-2.4 { filecount stmt-2.5 { REPLACE INTO t1 VALUES(5, 5) } 3 finish_test -