bk commit into 5.1 tree (mkindahl:1.2525) BUG#34244

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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, 2008-02-03 11:48:45+01:00, mkindahl@stripped +4 -0
  Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
             exists t1,t2,t3'
  Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
  Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
             'mysql/ndb_apply_status'
  
  Tests cases didn't wait for cluster to come up due to a typo
  in have_multi_ndb.inc.

  mysql-test/include/have_multi_ndb.inc@stripped, 2008-02-03 11:48:21+01:00, mkindahl@stripped +2 -2
    SHOW TABLES is case-sensitive in the pattern to LIKE.

  mysql-test/suite/ndb/t/disabled.def@stripped, 2008-02-03 11:48:27+01:00, mkindahl@stripped +0 -3
    Enabling tests.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test@stripped, 2008-02-03 11:48:32+01:00, mkindahl@stripped +1 -0
    Adding include of have_debug since test requires that.

  sql/sql_repl.cc@stripped, 2008-02-03 11:48:32+01:00, mkindahl@stripped +1 -1
    Replacing 'return' with 'DBUG_RETURN' in debug-traced function.

diff -Nrup a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc
--- a/mysql-test/include/have_multi_ndb.inc	2008-01-11 14:19:42 +01:00
+++ b/mysql-test/include/have_multi_ndb.inc	2008-02-03 11:48:21 +01:00
@@ -4,7 +4,7 @@ connect (server2,127.0.0.1,root,,test,$M
 
 # Check that server1 has NDB  support
 connection server1;
-let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1);
+let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1);
 disable_query_log;
 if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`)
 {
@@ -16,7 +16,7 @@ enable_query_log;
 
 # Check that server2 has NDB support
 connection server2;
-let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1);
+let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1);
 disable_query_log;
 if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`)
 {
diff -Nrup a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def
--- a/mysql-test/suite/ndb/t/disabled.def	2008-02-02 08:15:22 +01:00
+++ b/mysql-test/suite/ndb/t/disabled.def	2008-02-03 11:48:27 +01:00
@@ -11,10 +11,7 @@
 ##############################################################################
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 
-ndb_binlog_log_bin       : Bug #34244 2008-02-02 mats Test ndb_binlog_log_bin fails for 'drop table if exists t1,t2,t3'
-ndb_binlog_multi         : Bug #34245 2008-02-02 mats Test ndb_binlog_multi fails for 'CREATE TABLE'
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
-rpl_ndb_transaction      : Bug #34246 2008-02-02 mats Test rpl_ndb_transaction fails with 'Failed to create 'mysql/ndb_apply_status'
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test	2008-01-13 22:13:06 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test	2008-02-03 11:48:32 +01:00
@@ -6,6 +6,7 @@
 
 source include/ndb_master-slave.inc;
 source include/have_ndb.inc;
+source include/have_debug.inc;
 
 CREATE TABLE tmyisam (a int) ENGINE = MYISAM;
 CREATE TABLE tinnodb (a int) ENGINE = INNODB;
diff -Nrup a/sql/sql_repl.cc b/sql/sql_repl.cc
--- a/sql/sql_repl.cc	2008-01-31 16:31:52 +01:00
+++ b/sql/sql_repl.cc	2008-02-03 11:48:32 +01:00
@@ -1599,7 +1599,7 @@ int log_loaded_block(IO_CACHE* file)
   uint max_event_size= current_thd->variables.max_allowed_packet;
   lf_info= (LOAD_FILE_INFO*) file->arg;
   if (lf_info->thd->current_stmt_binlog_row_based)
-    return 0;
+    DBUG_RETURN(0);
   if (lf_info->last_pos_in_file != HA_POS_ERROR &&
       lf_info->last_pos_in_file >= my_b_get_pos_in_file(file))
     DBUG_RETURN(0);