bk commit into 5.1 tree (aelkin:1.2323) BUG#22067

[0]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-14 00:09:32+03:00, aelkin@stripped +5
-0
  BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage
  
  A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the default
  storage. This fails some tests invoking the set binlog_format explicitly.
  
  In the following are files and method to fix if needed.
  
  t/
  ndb_binlog_basic2.test         # here the failure is benign
  rpl_rbr_to_sbr.test            # does not check any ndb features =>             
  .                              # => not_ndb_default is enough
  rpl_row_basic_8partition.test  # set binlog_format can be replaced
  rpl_switch_stm_row_mixed.test  # does not check any ndb features =>
  .                              # => not_ndb_default is enough
  
  two more invoking invoke extra/rpl_truncate_helper.test
  
  rpl_truncate_2myisam           # to be fixed with not_ndb_default
  rpl_truncate_3innodb           # same as above
  .                              # because there is a dedicated to ndb .          
  .                              # rpl_truncate_7ndb* suit.

  mysql-test/t/rpl_rbr_to_sbr.test@stripped, 2006-09-14 00:09:22+03:00,
aelkin@stripped +2 -1
    # does not check any ndb features => not_ndb_default is enough

  mysql-test/t/rpl_row_basic_8partition.test@stripped, 2006-09-14 00:09:22+03:00,
aelkin@stripped +1 -1
    set binlog_format replaced

  mysql-test/t/rpl_switch_stm_row_mixed.test@stripped, 2006-09-14 00:09:23+03:00,
aelkin@stripped +1 -0
    does not check any ndb features => not_ndb_default is enough

  mysql-test/t/rpl_truncate_2myisam.test@stripped, 2006-09-14 00:09:23+03:00,
aelkin@stripped +1 -1
    not_ndb_default is enough since there is another suit for ndb.
     

  mysql-test/t/rpl_truncate_3innodb.test@stripped, 2006-09-14 00:09:23+03:00,
aelkin@stripped +1 -0
    not_ndb_default is enough since there is another suit for ndb.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-fe00f800-98.dhcp.inet.fi
# Root:	/home/elkin/MySQL/TEAM/FIXES/5.1/bug22067_set_blogformat_ndb

--- 1.11/mysql-test/t/rpl_switch_stm_row_mixed.test	2006-09-14 00:09:39 +03:00
+++ 1.12/mysql-test/t/rpl_switch_stm_row_mixed.test	2006-09-14 00:09:39 +03:00
@@ -1,4 +1,5 @@
 -- source include/have_row_based.inc
+-- source include/not_ndb_default.inc
 -- source include/master-slave.inc
 
 connection master;

--- 1.4/mysql-test/t/rpl_rbr_to_sbr.test	2006-09-14 00:09:39 +03:00
+++ 1.5/mysql-test/t/rpl_rbr_to_sbr.test	2006-09-14 00:09:39 +03:00
@@ -1,5 +1,6 @@
 -- source include/have_row_based.inc
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_row.inc
+-- source include/not_ndb_default.inc
 -- source include/master-slave.inc
 
 # Test that the slave temporarily switches to ROW when seeing binrow

--- 1.4/mysql-test/t/rpl_row_basic_8partition.test	2006-09-14 00:09:39 +03:00
+++ 1.5/mysql-test/t/rpl_row_basic_8partition.test	2006-09-14 00:09:39 +03:00
@@ -8,12 +8,12 @@
 ############################################################
 
 --source include/have_row_based.inc
+--source include/have_binlog_format_row.inc
 --source include/have_partition.inc
 --source include/master-slave.inc
 connection master;
 --disable_warnings
 DROP TABLE IF EXISTS t1;
-SET BINLOG_FORMAT=ROW;
 
 --echo **** Partition RANGE testing ****
 

--- 1.1/mysql-test/t/rpl_truncate_2myisam.test	2006-09-14 00:09:39 +03:00
+++ 1.2/mysql-test/t/rpl_truncate_2myisam.test	2006-09-14 00:09:39 +03:00
@@ -1,4 +1,4 @@
-
+--source include/not_ndb_default.inc
 let $engine=MyISAM;
 --source extra/rpl_tests/rpl_truncate.test
 

--- 1.1/mysql-test/t/rpl_truncate_3innodb.test	2006-09-14 00:09:39 +03:00
+++ 1.2/mysql-test/t/rpl_truncate_3innodb.test	2006-09-14 00:09:39 +03:00
@@ -1,5 +1,6 @@
 
 --source include/have_innodb.inc
+--source include/not_ndb_default.inc
 
 let $engine=InnoDB;
 --source extra/rpl_tests/rpl_truncate.test