Fix a problem in test file e_reindex.test. Cherrypick of [5b3de9390f2f].

FossilOrigin-Name: 80633682d714e5bedc129d8f579a46cc7c2040e6

diff --git a/manifest b/manifest
index 3cb6085d6f6f6273f172a845eefaaca3e886bf0b..77e0613c85f1907ddefbbeb4bd932a46b204c4ac 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sthe\sfts3\sintegrity-check\sto\sfail\sif\srun\sinside\sa\stransaction.\sCherrypick\sof\s[3b925189a75e].
-D 2015-05-20T20:34:37.772
+C Fix\sa\sproblem\sin\stest\sfile\se_reindex.test.\sCherrypick\sof\s[5b3de9390f2f].
+D 2015-05-20T20:50:59.596
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -450,7 +450,7 @@ F test/e_expr.test 8f5fdd7261e2d746813b0c6a1c0e34824ad3c5ad
 F test/e_fkey.test a1783fe1f759e1990e6a11adfcf0702dac4d0707
 F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
 F test/e_insert.test 7b2fa9cd1456f83474d6c5d27db3abaeb8be2023
-F test/e_reindex.test 396b7b4f0a66863b4e95116a67d93b227193e589
+F test/e_reindex.test 57d439f6c644befc8274ac93cf2f5449cf2736c1
 F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6
 F test/e_select.test 52692ff3849541e828ad4661fe3773a9b8711763
 F test/e_select2.test aceb80ab927d46fba5ce7586ebabf23e2bb0604f
@@ -1186,8 +1186,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P bd357739d74bfc97064e515645bce0834e586649
-Q +3b925189a75eae875da256b6e54999cad3cef1eb
-R e0ede56c8808e0d82e8cfc635c958355
+P 7d7d633c71bb36bed98bc2c77d3268cc26fbac3e
+Q +5b3de9390f2ffc4c530fd47c71c70e87972cf74b
+R b85e8aeadcdd5ec4c54b45311910ff86
 U dan
-Z cb92bf46651cd61331cde0014ce189c0
+Z e6c180a85390645dc9dfecdc10a4b12e

diff --git a/manifest.uuid b/manifest.uuid
index 58e1958b3a87a678b58f67fec9204fc19aa141a6..ecf3dae08a51c41a90716dca95e05b3a1a51db4d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d7d633c71bb36bed98bc2c77d3268cc26fbac3e
\ No newline at end of file
+80633682d714e5bedc129d8f579a46cc7c2040e6
\ No newline at end of file

diff --git a/test/e_reindex.test b/test/e_reindex.test
index 4b86787a05feac9af305a5aff2f833cc18771ac1..fa66aa7a1ff2763261e1a4a07dee47e89be09a34 100644 (file)
--- a/test/e_reindex.test
+++ b/test/e_reindex.test
@@ -48,8 +48,11 @@ do_execsql_test e_reindex-1.1 {
   INSERT INTO t1 VALUES(1, 2);
   INSERT INTO t1 VALUES(3, 4);
   INSERT INTO t1 VALUES(5, 6);
+
+  CREATE TABLE saved(a,b,c,d,e);
+  INSERT INTO saved SELECT * FROM sqlite_master WHERE type = 'index';
   PRAGMA writable_schema = 1;
-  UPDATE sqlite_master SET sql = '-- ' || sql WHERE type = 'index';
+  DELETE FROM sqlite_master WHERE type = 'index';
 } {}
 
 db close
@@ -59,7 +62,8 @@ do_execsql_test e_reindex-1.2 {
   INSERT INTO t1 VALUES(7, 8);
   INSERT INTO t1 VALUES(9, 10);
   PRAGMA writable_schema = 1;
-  UPDATE sqlite_master SET sql = substr(sql, 4) WHERE type = 'index';
+  INSERT INTO sqlite_master SELECT * FROM saved;
+  DROP TABLE saved;
 } {}
 
 db close