diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-22 23:41:37 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-22 23:41:37 +0200 |
| commit | 868d45c80fc2d205d636214e878850718fc62ebd (patch) | |
| tree | ecf28714b746e1537d32ea12ce3bb29a1a4600e9 /mysql-test | |
| parent | dcf935a198af05c701f0d5f9cd0d574acae321ed (diff) | |
| parent | 0b9bc329b037777c48668ae0045eee3acd637149 (diff) | |
| download | mariadb-git-868d45c80fc2d205d636214e878850718fc62ebd.tar.gz | |
merge from 5.1 of merge from 5.1-mtr
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/collections/default.experimental | 20 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 18b1b04c986..85c14c6f67a 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -1,19 +1,19 @@ -funcs_1.charset_collation_1 # depends on compile-time decisions -binlog.binlog_tmp_table* # Bug#45578: Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2' +# For easier human reading (MTR doesn't care), please keep entries +# 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' +funcs_1.charset_collation_1 # depends on compile-time decisions innodb.innodb_information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically - -main.ctype_gbk_binlog # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists -main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically +main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists main.information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically - -rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2 -rpl_ndb.rpl_ndb_log # Bug#38998 -rpl.rpl_innodb_bug28430* @solaris # Bug#46029 +main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically +main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled main.plugin_load @solaris # Bug#47146 rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31 -main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled +rpl.rpl_innodb_bug28430* @solaris # Bug#46029 rpl.rpl_plugin_load* @solaris # Bug#47146 +rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2 +rpl_ndb.rpl_ndb_log # Bug#38998 ndb.n* # Consider all NDB tests experimental. rpl_ndb.r* # Consider all NDB tests experimental. diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6c2ee4d66ea..83364db0eeb 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1796,7 +1796,7 @@ sub environment_setup { my $plugin_filename; if (IS_WINDOWS) { - $plugin_filename = "ha_example.dll"; + $plugin_filename = "ha_example.dll"; } else { |