Fix a problem in sessionfault.test causing it to segfault following a test failure...

FossilOrigin-Name: 582b2ae77d65b1e142ceb5774f37b0aaa3851378

diff --git a/ext/session/sessionfault.test b/ext/session/sessionfault.test
index 39f27bfe6d5622c2538f2391690b1ed866d0ddb6..dfe15a50c8280e0a1dcd97ff43caea69a9df8561 100644 (file)
--- a/ext/session/sessionfault.test
+++ b/ext/session/sessionfault.test
@@ -361,7 +361,7 @@ do_faultsim_test 6 -faults oom-* -body {
 }
 
 faultsim_delete_and_reopen
-do_execsql_test 5.prep1 {
+do_execsql_test 7.prep1 {
   CREATE TABLE t1(a, b, PRIMARY KEY(a));
 }
 faultsim_save_and_close
@@ -372,6 +372,7 @@ for {set ::i 0} {$::i < 480} {incr ::i 4} {
 }
 set res [lsort $res]
 do_faultsim_test 7 -faults oom-transient -prep {
+  catch { S delete }
   faultsim_restore_and_reopen
   sqlite3session S db main
   S attach *

diff --git a/manifest b/manifest
index 3107e3477098917e33e1b297eac88758e45a9128..4fc05623b8b297a7460ab710b6b8f42a89907484 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\schanges\sfor\sthe\s3.11.0\srelease\scandidate\sfrom\strunk.
-D 2016-02-13T14:07:56.771
+C Fix\sa\sproblem\sin\ssessionfault.test\scausing\sit\sto\ssegfault\sfollowing\sa\stest\sfailure.\sThis\scommit\sdoes\snot\sfix\sthe\sactual\stest\sfailure\s-\sjust\sthe\ssubsequent\ssegfault.
+D 2016-02-13T14:39:46.492
 F Makefile.in 5cbf3f753328d1bcd3a6117785b4874d99612f8f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 45e596bd4ccecf2256f68a2e96466aa52cc4bc1f
@@ -282,7 +282,7 @@ F ext/session/sessionD.test d4744c78334162851d2a2f285c7e603e31b49aa2
 F ext/session/sessionE.test e60a238c47f0feb3bb707e7f35e22be09c7e8f26
 F ext/session/sessionF.test c2f178d4dfd723a5fd94a730ea2ccb44c669e3ce
 F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596
-F ext/session/sessionfault.test bef044d0952c0d62c31c8d2400be72c8684545cc
+F ext/session/sessionfault.test 94a4dd100e16cf0b1c44d8487517dbb407eeab1d
 F ext/session/sqlite3session.c 1ace1d1e4cb32cf60ca6e8ed1ae8d4c9f99ca458
 F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d
 F ext/session/test_session.c 187bd344c5ae9d5be85e22ef7c3010f0c17307ce
@@ -1448,7 +1448,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f040a5bb62f3473fba6450c97c68f538d1df21ef a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
-R 622532d44eb7d789368cb4bcd5c9c290
-U drh
-Z 7f2e42b2e725136d738cebdbb2b0b796
+P 4d7a802e73ef0352f840bc8d74c560afb7666ff7
+R 56ec775a8f26a6fc9784a8bb5f2be4e3
+U dan
+Z 3166b3068d23321aad4e67ff074e960a

diff --git a/manifest.uuid b/manifest.uuid
index 1b543c3534380809570b067576edf14302dc74f7..c918008c70ab63da0dd26ff0f044bcbefdbb0d65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d7a802e73ef0352f840bc8d74c560afb7666ff7
\ No newline at end of file
+582b2ae77d65b1e142ceb5774f37b0aaa3851378
\ No newline at end of file