upstream 3.7.9

This commit is contained in:
Stephen Lombardo
2011-12-26 14:52:17 -05:00
parent 12069ec913
commit ddb595fbc9
329 changed files with 14622 additions and 8785 deletions
+4 -30
View File
@@ -270,7 +270,7 @@ do_malloc_test 9 -sqlprep {
do_malloc_test 10 -tclprep {
catch {db2 close}
db close
file delete -force test.db test.db-journal
forcedelete test.db test.db-journal
sqlite3 db test.db
sqlite3_extended_result_codes db 1
db eval {CREATE TABLE abc(a, b, c)}
@@ -341,8 +341,8 @@ if {$tcl_platform(platform)!="windows"} {
BEGIN;
INSERT INTO t1 VALUES(3, 4);
}
copy_file test2.db test.db
copy_file test2.db-journal test.db-journal
forcecopy test2.db test.db
forcecopy test2.db-journal test.db-journal
db2 close
} -tclbody {
sqlite3 db test.db
@@ -499,7 +499,7 @@ unset static_string
ifcapable attach {
do_malloc_test 20 -tclprep {
db close
file delete -force test2.db test2.db-journal
forcedelete test2.db test2.db-journal
sqlite3 db test2.db
sqlite3_extended_result_codes db 1
db eval {CREATE TABLE t1(x);}
@@ -867,32 +867,6 @@ if {[db eval {PRAGMA locking_mode}]!="exclusive"} {
catch { db2 close }
}
ifcapable stat2&&utf16 {
do_malloc_test 38 -tclprep {
add_test_collate db 0 0 1
execsql {
ANALYZE;
CREATE TABLE t4(x COLLATE test_collate);
CREATE INDEX t4x ON t4(x);
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 0, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 1, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 2, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 3, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 4, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 5, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 6, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 7, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 8, 'aaa');
INSERT INTO sqlite_stat2 VALUES('t4', 't4x', 9, 'aaa');
}
db close
sqlite3 db test.db
sqlite3_db_config_lookaside db 0 0 0
add_test_collate db 0 0 1
} -sqlbody {
SELECT * FROM t4 AS t41, t4 AS t42 WHERE t41.x>'ddd' AND t42.x>'ccc'
}
}
# Test that if an OOM error occurs, aux-data is still correctly destroyed.
# This test case was causing either a memory-leak or an assert() failure