post-push fixes

Disabled rpl_cross_version (instead of setting it experimental).
Fixed outstanding warning fix in main.debug_sync.

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.

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';

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