2681 Sergei Golubchik 2008-07-15 [merge]
6.0 -> 6.0-maria merge
modified:
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/rpl/t/disabled.def
2680 Sergei Golubchik 2008-07-14
removing tests that cause 4GB memory allocations
modified:
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/include/transaction_prealloc_size_basic.inc
mysql-test/r/query_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
mysql-test/r/transaction_prealloc_size_basic_32.result
mysql-test/r/transaction_prealloc_size_basic_64.result
=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def 2008-07-10 23:29:27 +0000
+++ b/mysql-test/suite/parts/t/disabled.def 2008-07-14 16:34:51 +0000
@@ -10,3 +10,5 @@ partition_value_ndb : Bug#305
partition_alter4_myisam : Bug#20129 / WL#4176
partition_alter4_innodb : Bug#20129 / WL#4176
partition_auto_increment_falcon : Bug#36595 2008-05-08 test crashes
+
+ndb_dd_backuprestore : Bug#32659 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-06-20 19:24:46 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-07-14 16:34:51 +0000
@@ -30,3 +30,8 @@ rpl_row_basic_7ndb : BUG#33360 2
rpl_redirect : Failure is sporadic and and the test is superfluous (mats)
rpl_innodb_bug28430 : Failure on Solaris Bug #36793
rpl_server_id1 : Bug #36818 rpl_server_id1 fails expecting slave has stopped (azundris)
+
+rpl_row_basic_2myisam : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_row_basic_3innodb : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_heartbeat : Bug#37714 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_idempotency : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
| Thread |
|---|
| • bzr push into mysql-6.0 branch (serg:2680 to 2681) | Sergei Golubchik | 15 Jul |
