Skip to content

Commit b9c2e0b

Browse files
committed
WL#6815 Adapt MySQL Cluster to 5.7
- the ndb_binlog_default_format.test intends to check that the binlog_format of mysqld is automatically upgraded to MIXED when mysqld is started with binlog_format = STATEMENT, this test was broken now when the default binlog_format has been changed to ROW. - fix test by changing the config to start mysqld with binlog_format STATEMENT - improve comments in test describing the test purpose
1 parent 0f9bcec commit b9c2e0b

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

mysql-test/suite/ndb_binlog/t/ndb_binlog_default_format.cnf

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ ndb-wait-setup=120
2020
ndb-cluster-connection-pool=3
2121
ndb-extra-logging=99
2222

23+
# Will be "auto upgraded" to MIXED
24+
binlog-format=STATEMENT
25+
2326
[ENV]
2427
NDB_CONNECTSTRING= @mysql_cluster.1.ndb_connectstring
2528
MASTER_MYPORT= @mysqld.1.1.port

mysql-test/suite/ndb_binlog/t/ndb_binlog_default_format.test

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
--source include/have_ndb.inc
22
--source include/not_embedded.inc
33

4+
# The purpose of this test is to show that the global binlog_format
5+
# is automatically upgraded to MIXED in case the mysqld is started
6+
# with STATEMENT
7+
48
show variables like 'log_bin';
9+
10+
#
11+
# Check that binlog_format has been auto upgraded to MIXED
12+
#
513
show variables like 'binlog_format';
614

15+
#
16+
# Run some basic statements and check how they look in the binlog
17+
#
718
use test;
819
create table test.t1 (a int primary key) engine=ndb;
9-
1020
insert into test.t1 values (1);
11-
1221
drop table test.t1;
13-
1422
--source include/show_binlog_events.inc
15-

0 commit comments

Comments
 (0)