-C Add\sfurther\stests\sto\sskipscan5.test.
-D 2014-06-28T17:35:15.306
+C Add\san\sOOM\sfault\sinjection\stest\sfor\sthe\snew\scode\son\sthis\sbranch.
+D 2014-06-28T19:06:49.846
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
-F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
+F src/vdbeaux.c 8ce7dcdbb8c59e5c2194518ce3099b254ae94c15
F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
-F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
+F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
F test/malloc_common.tcl 58e54229c4132ef882a11fab6419ec4cd3073589
F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ef5cdf949bb53a2958fa34e176b4b9eeda269de5
-R f17ac3e5a608781f5afc70c3d4b0020c
+P 4b8230e8fe93e73a615a46708aed5fa3557b6228
+R 626c4988935b78bcb3d2f8f34291bc5b
U dan
-Z 86f494cb467655f573b06b5ade5b9c90
+Z 19d12a554b06297187fc9a292703f2d4
set testdir [file dirname $argv0]
source $testdir/tester.tcl
source $testdir/malloc_common.tcl
+set testprefix mallocK
set sql {SELECT * FROM t1, t2 WHERE (a=1 OR a=2)}
for {set x 1} {$x<5} {incr x} {
}
}
+#-------------------------------------------------------------------------
+# Test that OOM errors are correctly handled by the code that uses stat4
+# data to estimate the number of rows visited by a skip-scan range query.
+#
+add_alignment_test_collations db
+do_execsql_test 6.0 {
+ CREATE TABLE t3(a TEXT, b TEXT COLLATE utf16_aligned, c);
+ INSERT INTO t3 VALUES('one', '.....', 0);
+ INSERT INTO t3 VALUES('one', '....x', 1);
+ INSERT INTO t3 VALUES('one', '...x.', 2);
+ INSERT INTO t3 VALUES('one', '...xx', 3);
+ INSERT INTO t3 VALUES('one', '..x..', 4);
+ INSERT INTO t3 VALUES('one', '..x.x', 5);
+ INSERT INTO t3 VALUES('one', '..xx.', 6);
+ INSERT INTO t3 VALUES('one', '..xxx', 7);
+ INSERT INTO t3 VALUES('one', '.x...', 8);
+ INSERT INTO t3 VALUES('one', '.x..x', 9);
+ INSERT INTO t3 VALUES('one', '.x.x.', 10);
+ INSERT INTO t3 VALUES('one', '.x.xx', 11);
+ INSERT INTO t3 VALUES('one', '.xx..', 12);
+ INSERT INTO t3 VALUES('one', '.xx.x', 13);
+ INSERT INTO t3 VALUES('one', '.xxx.', 14);
+ INSERT INTO t3 VALUES('one', '.xxxx', 15);
+
+ INSERT INTO t3 VALUES('two', 'x....', 16);
+ INSERT INTO t3 VALUES('two', 'x...x', 17);
+ INSERT INTO t3 VALUES('two', 'x..x.', 18);
+ INSERT INTO t3 VALUES('two', 'x..xx', 19);
+ INSERT INTO t3 VALUES('two', 'x.x..', 20);
+ INSERT INTO t3 VALUES('two', 'x.x.x', 21);
+ INSERT INTO t3 VALUES('two', 'x.xx.', 22);
+ INSERT INTO t3 VALUES('two', 'x.xxx', 23);
+ INSERT INTO t3 VALUES('two', 'xx...', 24);
+ INSERT INTO t3 VALUES('two', 'xx..x', 25);
+ INSERT INTO t3 VALUES('two', 'xx.x.', 26);
+ INSERT INTO t3 VALUES('two', 'xx.xx', 27);
+ INSERT INTO t3 VALUES('two', 'xxx..', 28);
+ INSERT INTO t3 VALUES('two', 'xxx.x', 29);
+ INSERT INTO t3 VALUES('two', 'xxxx.', 30);
+ INSERT INTO t3 VALUES('two', 'xxxxx', 31);
+
+ INSERT INTO t3 SELECT * FROM t3;
+
+ CREATE INDEX i3 ON t3(a, b);
+ ANALYZE;
+
+ SELECT 'x' > '.';
+} {1}
+
+ifcapable stat4 {
+ do_eqp_test 6.1 {
+ SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx';
+ } {
+ 0 0 0 {SEARCH TABLE t3 USING INDEX i3 (ANY(a) AND b>? AND b<?)}
+ 0 0 0 {USE TEMP B-TREE FOR DISTINCT}
+ }
+}
+
+do_faultsim_test 6 -faults oom* -body {
+ db cache flush
+ db eval { SELECT DISTINCT c FROM t3 WHERE b BETWEEN '.xx..' AND '.xxxx' }
+} -test {
+ faultsim_test_result {0 {12 13 14 15}}
+}
finish_test
+