diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-16 12:58:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-16 12:58:56 +0200 |
| commit | 9b48499dc44ef8a7b1722a273f12a3198ec7784b (patch) | |
| tree | 4876aa326b76a82a1fb88ab7ca04965ddd550544 /mysql-test/suite/maria | |
| parent | fdd62e53c21f01381e2b366b757d2c3d0e1a207c (diff) | |
| parent | cfbee9359c4282cbff7426d6e71994205964f2df (diff) | |
| download | mariadb-git-9b48499dc44ef8a7b1722a273f12a3198ec7784b.tar.gz | |
merged
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/r/maria-recover.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/r/maria3.result | 26 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/maria3.test | 18 |
3 files changed, 44 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/r/maria-recover.result b/mysql-test/suite/maria/r/maria-recover.result index aee4119304f..e9bfc019c81 100644 --- a/mysql-test/suite/maria/r/maria-recover.result +++ b/mysql-test/suite/maria/r/maria-recover.result @@ -8,7 +8,7 @@ OFF set global maria_recover=default; select @@global.maria_recover; @@global.maria_recover -OFF +NORMAL set global maria_recover=normal; select @@global.maria_recover; @@global.maria_recover diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result index ff609eb21da..4fb08ed192e 100644 --- a/mysql-test/suite/maria/r/maria3.result +++ b/mysql-test/suite/maria/r/maria3.result @@ -315,7 +315,7 @@ maria_pagecache_age_threshold 300 maria_pagecache_buffer_size 8384512 maria_pagecache_division_limit 100 maria_page_checksum OFF -maria_recover OFF +maria_recover NORMAL maria_repair_threads 1 maria_sort_buffer_size 8388608 maria_stats_method nulls_unequal @@ -552,6 +552,30 @@ select count(*) from t1 where a >= 4; count(*) 1 drop table t1, t2; +create temporary table t1 (a int, key(a)) transactional=0 row_format=page; +create temporary table t2 (a int, key(a)) transactional=0 row_format=page; +insert into t1 values (0),(1),(2),(3),(4); +insert into t2 select * from t1; +insert into t1 select NULL from t2; +select count(*) from t1; +count(*) +10 +select count(*) from t1 where a >= 4; +count(*) +1 +drop table t1, t2; +create temporary table t1 (a int, key(a)) transactional=0 row_format=fixed; +create temporary table t2 (a int, key(a)) transactional=0 row_format=dynamic; +insert into t1 values (0),(1),(2),(3),(4); +insert into t2 select * from t1; +insert into t1 select NULL from t2; +select count(*) from t1; +count(*) +10 +select count(*) from t1 where a >= 4; +count(*) +1 +drop table t1, t2; create table t1 (i int auto_increment not null primary key) transactional=0; check table t1 extended; Table Op Msg_type Msg_text diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test index 45765b3b868..f2ae5d73fb2 100644 --- a/mysql-test/suite/maria/t/maria3.test +++ b/mysql-test/suite/maria/t/maria3.test @@ -433,6 +433,24 @@ select count(*) from t1; select count(*) from t1 where a >= 4; drop table t1, t2; +create temporary table t1 (a int, key(a)) transactional=0 row_format=page; +create temporary table t2 (a int, key(a)) transactional=0 row_format=page; +insert into t1 values (0),(1),(2),(3),(4); +insert into t2 select * from t1; +insert into t1 select NULL from t2; +select count(*) from t1; +select count(*) from t1 where a >= 4; +drop table t1, t2; + +create temporary table t1 (a int, key(a)) transactional=0 row_format=fixed; +create temporary table t2 (a int, key(a)) transactional=0 row_format=dynamic; +insert into t1 values (0),(1),(2),(3),(4); +insert into t2 select * from t1; +insert into t1 select NULL from t2; +select count(*) from t1; +select count(*) from t1 where a >= 4; +drop table t1, t2; + # # Test problems with small rows and row_type=page # Bug 35048 "maria table corruption reported when transactional=0" |