diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index cbb6af2c309937905f308afd500ab25cac55fb14..7bceddcb2b259c3d9dd76cb9c8ebe469c719936e 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -25,7 +25,6 @@ rpl.rpl_log_pos* # Bug#47743 2009-10-02 alik rpl.rpl_log rpl.rpl_trigger* # Bug#46656 2009-09-25 alik InnoDB plugin: memory leaks (Valgrind) rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically -rpl.rpl_cross_version # BUG#43913 2009-10-22 luis rpl_cross_version fails with symptom in described in bug report # Declare all NDB-tests in ndb and rpl_ndb test suites experimental. diff --git a/mysql-test/r/debug_sync.result b/mysql-test/r/debug_sync.result index 47e968f79cf14635454c06fedd08e6af21dafdd3..8b46334204c2bd8a49f426553d8ef05b68dfcc91 100644 --- a/mysql-test/r/debug_sync.result +++ b/mysql-test/r/debug_sync.result @@ -243,7 +243,7 @@ GRANT ALL ON *.* TO mysqltest_2@localhost; REVOKE SUPER ON *.* FROM mysqltest_2@localhost; connection con1, mysqltest_2 SET DEBUG_SYNC= 'RESET'; -ERROR 42000: Access denied; you need the SUPER privilege for this operation +ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation connection default DROP USER mysqltest_2@localhost; SET DEBUG_SYNC= 'RESET'; diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 3e3069d5d9208af73daa6960782bd028cb66b1ff..28adc61d06b9b488e2d47a5c400c118f48fd8dea 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -11,3 +11,4 @@ ############################################################################## rpl_get_master_version_and_clock: # Bug#46931 2009-10-17 joro rpl.rpl_get_master_version_and_clock fails +rpl_cross_version : BUG#43913 2009-10-22 luis rpl_cross_version fails with symptom in described in bug report