MySQL Lists: commits: bk commit into 5.1 tree (tomas:1.2537)

List:	Commits	« Previous Message Next Message »
From:	tomas	Date:	July 6 2007 7:04pm
Subject:	bk commit into 5.1 tree (tomas:1.2537)
View as plain text
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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, 2007-07-06 19:04:11+02:00, tomas@stripped +37 -0
  WL#3303
  - row based ndb logging also in mixed

  mysql-test/t/ndb_autodiscover3.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_basic.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_ddl_multi.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_discover.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_ignore_db.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_log_bin.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_binlog_multi.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/ndb_multi_row.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_UUID.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_bank.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_basic.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_blob.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_blob2.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_circular.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_circular_simplex.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_basic.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_dd_partitions.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_ddl.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_delete_nowhere.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_do_db.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_do_table.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_extraCol.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_func003.test@stripped, 2007-07-06 19:04:07+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_idempotent.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_insert_ignore.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi_update2.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_multi_update3.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_rep_ignore.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_row_001.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sp003.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sp006.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_sync.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndb_trig004.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_ndbapi_multi.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

  mysql-test/t/rpl_row_basic_7ndb.test@stripped, 2007-07-06 19:04:08+02:00,
tomas@stripped +1 -1
    WL#3303
    - row based ndb logging also in mixed

diff -Nrup a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/t/ndb_autodiscover3.test
--- a/mysql-test/t/ndb_autodiscover3.test	2007-06-30 11:45:26 +02:00
+++ b/mysql-test/t/ndb_autodiscover3.test	2007-07-06 19:04:07 +02:00
@@ -3,7 +3,7 @@
 -- source include/not_embedded.inc
 
 # see bug#21563
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1, t2;
diff -Nrup a/mysql-test/t/ndb_binlog_basic.test b/mysql-test/t/ndb_binlog_basic.test
--- a/mysql-test/t/ndb_binlog_basic.test	2006-12-01 15:48:24 +01:00
+++ b/mysql-test/t/ndb_binlog_basic.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1, t2;
diff -Nrup a/mysql-test/t/ndb_binlog_ddl_multi.test
b/mysql-test/t/ndb_binlog_ddl_multi.test
--- a/mysql-test/t/ndb_binlog_ddl_multi.test	2007-06-30 11:42:34 +02:00
+++ b/mysql-test/t/ndb_binlog_ddl_multi.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;
diff -Nrup a/mysql-test/t/ndb_binlog_discover.test b/mysql-test/t/ndb_binlog_discover.test
--- a/mysql-test/t/ndb_binlog_discover.test	2007-04-18 23:08:53 +02:00
+++ b/mysql-test/t/ndb_binlog_discover.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 drop table if exists t1;
diff -Nrup a/mysql-test/t/ndb_binlog_ignore_db.test
b/mysql-test/t/ndb_binlog_ignore_db.test
--- a/mysql-test/t/ndb_binlog_ignore_db.test	2007-04-19 06:24:33 +02:00
+++ b/mysql-test/t/ndb_binlog_ignore_db.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 reset master;
 
 --disable_warnings
diff -Nrup a/mysql-test/t/ndb_binlog_log_bin.test b/mysql-test/t/ndb_binlog_log_bin.test
--- a/mysql-test/t/ndb_binlog_log_bin.test	2007-06-30 11:45:26 +02:00
+++ b/mysql-test/t/ndb_binlog_log_bin.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;
diff -Nrup a/mysql-test/t/ndb_binlog_multi.test b/mysql-test/t/ndb_binlog_multi.test
--- a/mysql-test/t/ndb_binlog_multi.test	2007-06-30 11:45:26 +02:00
+++ b/mysql-test/t/ndb_binlog_multi.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_multi_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 --disable_warnings
 connection server2;
diff -Nrup a/mysql-test/t/ndb_multi_row.test b/mysql-test/t/ndb_multi_row.test
--- a/mysql-test/t/ndb_multi_row.test	2007-02-28 20:33:57 +01:00
+++ b/mysql-test/t/ndb_multi_row.test	2007-07-06 19:04:07 +02:00
@@ -1,7 +1,7 @@
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 
 
 --disable_warnings
diff -Nrup a/mysql-test/t/rpl_ndb_UUID.test b/mysql-test/t/rpl_ndb_UUID.test
--- a/mysql-test/t/rpl_ndb_UUID.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_UUID.test	2007-07-06 19:04:07 +02:00
@@ -2,7 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_row_UUID.test
diff -Nrup a/mysql-test/t/rpl_ndb_bank.test b/mysql-test/t/rpl_ndb_bank.test
--- a/mysql-test/t/rpl_ndb_bank.test	2007-06-18 23:51:07 +02:00
+++ b/mysql-test/t/rpl_ndb_bank.test	2007-07-06 19:04:07 +02:00
@@ -12,7 +12,7 @@
  
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # kill any trailing processes
diff -Nrup a/mysql-test/t/rpl_ndb_basic.test b/mysql-test/t/rpl_ndb_basic.test
--- a/mysql-test/t/rpl_ndb_basic.test	2007-06-18 23:51:07 +02:00
+++ b/mysql-test/t/rpl_ndb_basic.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 
diff -Nrup a/mysql-test/t/rpl_ndb_blob.test b/mysql-test/t/rpl_ndb_blob.test
--- a/mysql-test/t/rpl_ndb_blob.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_blob.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #
diff -Nrup a/mysql-test/t/rpl_ndb_blob2.test b/mysql-test/t/rpl_ndb_blob2.test
--- a/mysql-test/t/rpl_ndb_blob2.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_blob2.test	2007-07-06 19:04:07 +02:00
@@ -4,7 +4,7 @@
 # code between engine tests     #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_blob.test
diff -Nrup a/mysql-test/t/rpl_ndb_circular.test b/mysql-test/t/rpl_ndb_circular.test
--- a/mysql-test/t/rpl_ndb_circular.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_circular.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # set up circular replication
diff -Nrup a/mysql-test/t/rpl_ndb_circular_simplex.test
b/mysql-test/t/rpl_ndb_circular_simplex.test
--- a/mysql-test/t/rpl_ndb_circular_simplex.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_circular_simplex.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 connection master;
diff -Nrup a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/t/rpl_ndb_dd_advance.test
--- a/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-21 22:00:04 +02:00
+++ b/mysql-test/t/rpl_ndb_dd_advance.test	2007-07-06 19:04:07 +02:00
@@ -6,7 +6,7 @@
 
 #### Include Section ####
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
 #--source include/big_test.inc
diff -Nrup a/mysql-test/t/rpl_ndb_dd_basic.test b/mysql-test/t/rpl_ndb_dd_basic.test
--- a/mysql-test/t/rpl_ndb_dd_basic.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_dd_basic.test	2007-07-06 19:04:07 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings
diff -Nrup a/mysql-test/t/rpl_ndb_dd_partitions.test
b/mysql-test/t/rpl_ndb_dd_partitions.test
--- a/mysql-test/t/rpl_ndb_dd_partitions.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_dd_partitions.test	2007-07-06 19:04:07 +02:00
@@ -6,7 +6,7 @@
 #######################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --echo --- Doing pre test cleanup --- 
diff -Nrup a/mysql-test/t/rpl_ndb_ddl.test b/mysql-test/t/rpl_ndb_ddl.test
--- a/mysql-test/t/rpl_ndb_ddl.test	2007-06-18 23:55:45 +02:00
+++ b/mysql-test/t/rpl_ndb_ddl.test	2007-07-06 19:04:07 +02:00
@@ -24,7 +24,7 @@
 #
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 let $engine_type= NDB;
 let $temp_engine_type= MEMORY;
diff -Nrup a/mysql-test/t/rpl_ndb_delete_nowhere.test
b/mysql-test/t/rpl_ndb_delete_nowhere.test
--- a/mysql-test/t/rpl_ndb_delete_nowhere.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_delete_nowhere.test	2007-07-06 19:04:07 +02:00
@@ -3,7 +3,7 @@
 # Share test code between engine tests  #
 #########################################
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_delete_no_where.test
diff -Nrup a/mysql-test/t/rpl_ndb_do_db.test b/mysql-test/t/rpl_ndb_do_db.test
--- a/mysql-test/t/rpl_ndb_do_db.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_do_db.test	2007-07-06 19:04:07 +02:00
@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings
diff -Nrup a/mysql-test/t/rpl_ndb_do_table.test b/mysql-test/t/rpl_ndb_do_table.test
--- a/mysql-test/t/rpl_ndb_do_table.test	2007-06-18 23:51:07 +02:00
+++ b/mysql-test/t/rpl_ndb_do_table.test	2007-07-06 19:04:07 +02:00
@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings
diff -Nrup a/mysql-test/t/rpl_ndb_extraCol.test b/mysql-test/t/rpl_ndb_extraCol.test
--- a/mysql-test/t/rpl_ndb_extraCol.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_extraCol.test	2007-07-06 19:04:07 +02:00
@@ -4,7 +4,7 @@
 # Purpose: Wapper for rpl_extraSlave_Col.test
 #          Using NDB
 ########################################### 
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
 let $engine_type = 'NDB';
diff -Nrup a/mysql-test/t/rpl_ndb_func003.test b/mysql-test/t/rpl_ndb_func003.test
--- a/mysql-test/t/rpl_ndb_func003.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_func003.test	2007-07-06 19:04:07 +02:00
@@ -7,7 +7,7 @@
 # reduce test case code           #
 ###################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
diff -Nrup a/mysql-test/t/rpl_ndb_idempotent.test b/mysql-test/t/rpl_ndb_idempotent.test
--- a/mysql-test/t/rpl_ndb_idempotent.test	2007-06-18 23:51:07 +02:00
+++ b/mysql-test/t/rpl_ndb_idempotent.test	2007-07-06 19:04:08 +02:00
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #
diff -Nrup a/mysql-test/t/rpl_ndb_insert_ignore.test
b/mysql-test/t/rpl_ndb_insert_ignore.test
--- a/mysql-test/t/rpl_ndb_insert_ignore.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_insert_ignore.test	2007-07-06 19:04:08 +02:00
@@ -2,7 +2,7 @@
 # Wrapper for rpl_insert_ignore.test#
 #####################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 let $engine_type2=myisam;
diff -Nrup a/mysql-test/t/rpl_ndb_multi.test b/mysql-test/t/rpl_ndb_multi.test
--- a/mysql-test/t/rpl_ndb_multi.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_multi.test	2007-07-06 19:04:08 +02:00
@@ -1,5 +1,5 @@
 --source include/have_multi_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 # note: server2 is another "master" connected to the master cluster
diff -Nrup a/mysql-test/t/rpl_ndb_multi_update2.test
b/mysql-test/t/rpl_ndb_multi_update2.test
--- a/mysql-test/t/rpl_ndb_multi_update2.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_multi_update2.test	2007-07-06 19:04:08 +02:00
@@ -6,7 +6,7 @@
 
 # Run this only for row based replication, as replication of
 # auto_increment values are not supported with NDB as storage engine
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 
 let $engine_type=NDB;
diff -Nrup a/mysql-test/t/rpl_ndb_multi_update3.test
b/mysql-test/t/rpl_ndb_multi_update3.test
--- a/mysql-test/t/rpl_ndb_multi_update3.test	2007-06-18 15:36:06 +02:00
+++ b/mysql-test/t/rpl_ndb_multi_update3.test	2007-07-06 19:04:08 +02:00
@@ -3,7 +3,7 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_multi_update3.test
diff -Nrup a/mysql-test/t/rpl_ndb_rep_ignore.test b/mysql-test/t/rpl_ndb_rep_ignore.test
--- a/mysql-test/t/rpl_ndb_rep_ignore.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndb_rep_ignore.test	2007-07-06 19:04:08 +02:00
@@ -7,7 +7,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 --disable_warnings
diff -Nrup a/mysql-test/t/rpl_ndb_row_001.test b/mysql-test/t/rpl_ndb_row_001.test
--- a/mysql-test/t/rpl_ndb_row_001.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndb_row_001.test	2007-07-06 19:04:08 +02:00
@@ -2,7 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_001.test
diff -Nrup a/mysql-test/t/rpl_ndb_sp003.test b/mysql-test/t/rpl_ndb_sp003.test
--- a/mysql-test/t/rpl_ndb_sp003.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndb_sp003.test	2007-07-06 19:04:08 +02:00
@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp003.test
diff -Nrup a/mysql-test/t/rpl_ndb_sp006.test b/mysql-test/t/rpl_ndb_sp006.test
--- a/mysql-test/t/rpl_ndb_sp006.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndb_sp006.test	2007-07-06 19:04:08 +02:00
@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp006.test
diff -Nrup a/mysql-test/t/rpl_ndb_sync.test b/mysql-test/t/rpl_ndb_sync.test
--- a/mysql-test/t/rpl_ndb_sync.test	2007-06-18 23:51:07 +02:00
+++ b/mysql-test/t/rpl_ndb_sync.test	2007-07-06 19:04:08 +02:00
@@ -1,7 +1,7 @@
 --source include/have_ndb.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
---source include/have_binlog_format_row.inc
+--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc
 
 #
diff -Nrup a/mysql-test/t/rpl_ndb_trig004.test b/mysql-test/t/rpl_ndb_trig004.test
--- a/mysql-test/t/rpl_ndb_trig004.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndb_trig004.test	2007-07-06 19:04:08 +02:00
@@ -7,7 +7,7 @@
 #############################################################################
 
 # Includes
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
diff -Nrup a/mysql-test/t/rpl_ndbapi_multi.test b/mysql-test/t/rpl_ndbapi_multi.test
--- a/mysql-test/t/rpl_ndbapi_multi.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_ndbapi_multi.test	2007-07-06 19:04:08 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndbapi_examples.inc
 -- source include/ndb_master-slave.inc
 
diff -Nrup a/mysql-test/t/rpl_row_basic_7ndb.test b/mysql-test/t/rpl_row_basic_7ndb.test
--- a/mysql-test/t/rpl_row_basic_7ndb.test	2007-06-18 15:36:07 +02:00
+++ b/mysql-test/t/rpl_row_basic_7ndb.test	2007-07-06 19:04:08 +02:00
@@ -1,5 +1,5 @@
 -- source include/have_ndb.inc
--- source include/have_binlog_format_row.inc
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 
 let $type= 'NDB' ;
Thread
• bk commit into 5.1 tree (tomas:1.2537)	tomas	6 Jul