Fix a test script problem in exclusive2.test causing it to fail on this

branch.

FossilOrigin-Name: f66614dc78e32d2d369518200b3322cd97990ffe

diff --git a/manifest b/manifest
index 0fa8005bed70a0d863df867cffca443f6bfef7f0..88faa9a14092081fee198360ff2a03f2175a7916 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sthe\spre-update\shook\son\sthis\sbranch.
-D 2017-01-25T17:44:13.969
+C Fix\sa\stest\sscript\sproblem\sin\sexclusive2.test\scausing\sit\sto\sfail\son\sthis\nbranch.
+D 2017-01-25T18:12:46.110
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -679,7 +679,7 @@ F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
 F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
 F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
-F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
+F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
 F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
@@ -1547,7 +1547,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 118ded403b95050b74ae2b03919c43d614094a32
-R b2da1f7f2be6fc581980d1f7d80d3a07
+P 6fc4fbfa29cfa795edf32e4a1f2d0eceb3007f68
+R c06506894b1f7b9de189bb73f3ac7abf
 U dan
-Z e5faacbef3e7f4e557b616df3270ec25
+Z 47f4a5e852dc6941a6a828eee1ba5cee

diff --git a/manifest.uuid b/manifest.uuid
index eaecf9f4a3b758838d618c1d37371a42f2c8ce62..947e5dcd6a961ec75884981041b7936cff6e92ab 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6fc4fbfa29cfa795edf32e4a1f2d0eceb3007f68
\ No newline at end of file
+f66614dc78e32d2d369518200b3322cd97990ffe
\ No newline at end of file

diff --git a/test/exclusive2.test b/test/exclusive2.test
index 712363e7620fd357e40dfd3c39fae86c574c138e..92fcd76ab3858d18718ce6a753f82e9ec50109b2 100644 (file)
--- a/test/exclusive2.test
+++ b/test/exclusive2.test
@@ -121,13 +121,13 @@ do_test exclusive2-1.1 {
   execsql {
     BEGIN;
     CREATE TABLE t1(a, b);
-    INSERT INTO t1(a) VALUES(randstr(10, 400));
-    INSERT INTO t1(a) VALUES(randstr(10, 400));
-    INSERT INTO t1(a) SELECT randstr(10, 400) FROM t1;
-    INSERT INTO t1(a) SELECT randstr(10, 400) FROM t1;
-    INSERT INTO t1(a) SELECT randstr(10, 400) FROM t1;
-    INSERT INTO t1(a) SELECT randstr(10, 400) FROM t1;
-    INSERT INTO t1(a) SELECT randstr(10, 400) FROM t1;
+    INSERT INTO t1(a, b) VALUES(randstr(10, 400), 0);
+    INSERT INTO t1(a, b) VALUES(randstr(10, 400), 0);
+    INSERT INTO t1(a, b) SELECT randstr(10, 400), 0 FROM t1;
+    INSERT INTO t1(a, b) SELECT randstr(10, 400), 0 FROM t1;
+    INSERT INTO t1(a, b) SELECT randstr(10, 400), 0 FROM t1;
+    INSERT INTO t1(a, b) SELECT randstr(10, 400), 0 FROM t1;
+    INSERT INTO t1(a, b) SELECT randstr(10, 400), 0 FROM t1;
     COMMIT;
     SELECT count(*) FROM t1;
   }
@@ -154,7 +154,7 @@ do_test exclusive2-1.4 {
 } $::sig
 do_test exclusive2-1.5 {
   execsql {
-    UPDATE t1 SET b=a, a=NULL;
+    UPDATE t1 SET b=a, a=0;
   } db2
   expr {[t1sig db2] eq $::sig}
 } 0