diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:28:31 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 17:28:31 +0400 |
| commit | b930b18ec3463e47736647c26af0eea07c242a63 (patch) | |
| tree | e10df06a55f0a2e5791792f832e0cab38bf70b99 /mysql-test | |
| parent | 4ed388a5b4c569de6827f1d589aefdc1772ac546 (diff) | |
| parent | ee56b111a0769b07e2987d138c676beadb3c574e (diff) | |
| download | mariadb-git-b930b18ec3463e47736647c26af0eea07c242a63.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/collections/default.experimental | 1 | ||||
| -rw-r--r-- | mysql-test/r/myisam.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/myisam.test | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 41d5282a6c9..1e811ecd8c2 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -2,6 +2,7 @@ # in alphabetical order. This also helps with merge conflict resolution. binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2' +binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin funcs_1.charset_collation_1 # depends on compile-time decisions diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index df97e96c334..f5050ccf1c0 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -2290,13 +2290,6 @@ Table Op Msg_type Msg_text test.t1 repair error myisam_sort_buffer_size is too small test.t1 repair warning Number of rows changed from 0 to 7168 test.t1 repair status OK -SET myisam_repair_threads=2; -REPAIR TABLE t1; -Table Op Msg_type Msg_text -test.t1 repair error myisam_sort_buffer_size is too small -test.t1 repair warning Number of rows changed from # to 7168 -test.t1 repair status OK -SET myisam_repair_threads=@@global.myisam_repair_threads; SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; DROP TABLE t1; End of 5.1 tests diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index faeb5ee686a..e4ea939f348 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1538,11 +1538,14 @@ INSERT INTO t1 SELECT a+2560,b FROM t1; INSERT INTO t1 SELECT a+5120,b FROM t1; SET myisam_sort_buffer_size=4; REPAIR TABLE t1; -SET myisam_repair_threads=2; + +# !!! Disabled until additional fix for BUG#47073 is pushed. +#SET myisam_repair_threads=2; # May report different values depending on threads activity. ---replace_regex /changed from [0-9]+/changed from #/ -REPAIR TABLE t1; -SET myisam_repair_threads=@@global.myisam_repair_threads; +#--replace_regex /changed from [0-9]+/changed from #/ +#REPAIR TABLE t1; +#SET myisam_repair_threads=@@global.myisam_repair_threads; + SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; DROP TABLE t1; |