Commit d0baba61 authored by unknown's avatar unknown
Browse files

Bug #20843 tests fails randomly with assertion in completeClusterFailed 

Bug #20902 Alter table invalid schema version with statement-based binlogging
(latter caused by the above)
parent 4e14d3b7

mysql-test/t/ndb_alter_table3.test

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc



# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.

-- source include/have_binlog_format_row.inc



--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings

mysql-test/t/ndb_autodiscover3.test

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
-- source include/have_multi_ndb.inc

-- source include/not_embedded.inc



# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.

-- source include/have_binlog_format_row.inc





--disable_warnings

drop table if exists t1, t2;

--enable_warnings

mysql-test/t/ndb_dd_advance.test

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
-- source include/have_ndb.inc

-- source include/not_embedded.inc



# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.

-- source include/have_binlog_format_row.inc



--disable_warnings

DROP TABLE IF EXISTS test.t1;

DROP TABLE IF EXISTS test.t2;

mysql-test/t/ndb_multi.test

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
-- source include/not_embedded.inc

-- source include/have_binlog_format_statement.inc



# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.

-- source include/have_binlog_format_row.inc





--disable_warnings

connection server2;

drop table if exists t1, t2, t3, t4;

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -4781,7 +4781,7 @@ int ha_ndbcluster::create(const char *name, 
        expect it to be there.

      */

      if (!ndbcluster_create_event(ndb, m_table, event_name.c_ptr(), share,

                                   share && do_event_op /* push warning */))

                                   share && do_event_op ? 2 : 1/* push warning */))

      {

        if (ndb_extra_logging)

          sql_print_information("NDB Binlog: CREATE TABLE Event: %s",
@@ -5175,7 +5175,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
    const NDBTAB *ndbtab= ndbtab_g2.get_table();



    if (!ndbcluster_create_event(ndb, ndbtab, event_name.c_ptr(), share,

                                 share && ndb_binlog_running /* push warning */))

                                 share && ndb_binlog_running ? 2 : 1/* push warning */))

    {

      if (ndb_extra_logging)

        sql_print_information("NDB Binlog: RENAME Event: %s",