bzr push into mysql-6.0-rpl branch (zhenxing.he:2719 to 2721) Bug#39007

[He Zhenxing]

 2721 He Zhenxing	2008-11-03 [merge]
      Merge BUG#39007 to 6.0-rpl
modified:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test

 2720 He Zhenxing	2008-11-03 [merge]
      Merge BUG#39714
modified:
  mysql-test/suite/backup/r/backup_logs.result
  mysql-test/suite/backup/t/backup_logs.test

 2719 Mats Kindahl	2008-10-30 [merge]
      Merging fixes from 5.1-rpl.
modified:
  mysql-test/r/mysql_upgrade.result

=== modified file 'mysql-test/suite/backup/r/backup_logs.result'
--- a/mysql-test/suite/backup/r/backup_logs.result	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/r/backup_logs.result	2008-11-03 08:46:24 +0000
@@ -188,7 +188,7 @@ SET SESSION debug="d,set_backup_id";
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 backup_id
 500
-SET SESSION debug="d";
+SET SESSION debug="";
 The backup id for this command should be 501.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 backup_id

=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test	2008-11-03 08:46:24 +0000
@@ -208,7 +208,7 @@ SET SESSION debug="d,set_backup_id";
 #--replace_column 1 #
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
-SET SESSION debug="d";
+SET SESSION debug="";
 
 --remove_file $MYSQLD_BACKUPDIR/backup_logs_orig.bak
 --echo The backup id for this command should be 501.

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf	2008-04-25 16:54:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf	2008-10-31 14:11:44 +0000
@@ -3,17 +3,14 @@
 [mysqld.1.1]
 server-id= 1
 log-bin
-log-slave-updates
 
 [mysqld.2.1]
 server-id= 1
 log-bin
-log-slave-updates
 
 [mysqld.1.slave]
 server-id= 2
 log-bin
-log-slave-updates
 skip-slave-start
 
 [mysqld.2.slave]
@@ -25,7 +22,6 @@ master-user=		@mysqld.2.1.#user
 master-connect-retry=	1
 init-rpl-role=		slave
 log-bin
-log-slave-updates
 skip-slave-start
 ndb_connectstring=	@mysql_cluster.slave.ndb_connectstring
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-08-15 02:31:04 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2008-10-31 14:11:44 +0000
@@ -6,6 +6,7 @@
 #############################################################
 --source include/have_ndb.inc
 --source include/ndb_master-slave_2ch.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --echo
 
 # Check server_id and set auto_increment_* variables