Skip to content

Commit 73c702e

Browse files
committed
MariaRocks port: fix rocksdb.rpl_row_rocksdb test
The 'combinations' system in MTR ignores settings from $testname.cnf, and tries to run RBR test with binlog_format=mixed. Fixed by using "source include/have_binlog_format_row.inc" which tells MTR to only run the test with binlog_format=ROW. The test still needs its $testname.cnf to include suite/rpl/my.cnf. This is necessary to setup replication (Using "source include/master-slave.inc" will have MTR set up replication for the test, but only as long as the testsuite doesn't have its own suite/rocksdb/my.cnf. We do have that file (and it doesn't set up replication), so we need to have $testname.cnf to setup replication).
1 parent 8e2cfde commit 73c702e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

storage/rocksdb/mysql-test/rocksdb/r/rpl_row_rocksdb.result

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
include/master-slave.inc
2-
Warnings:
3-
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
4-
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
52
[connection master]
3+
connection master;
64
drop table if exists t1;
5+
connection master;
76
select @@binlog_format;
87
@@binlog_format
98
ROW
109
create table t1 (pk int primary key) engine=rocksdb;
1110
insert into t1 values (1),(2),(3);
1211
include/sync_slave_sql_with_master.inc
12+
connection slave;
1313
select * from t1;
1414
pk
1515
1
1616
2
1717
3
18+
connection master;
1819
drop table t1;
1920
#
2021
# Issue #18: slave crash on update with row based binary logging
@@ -29,6 +30,7 @@ update t1 set value2=100 where id=1;
2930
update t1 set value2=200 where id=2;
3031
update t1 set value2=300 where id=3;
3132
include/sync_slave_sql_with_master.inc
33+
connection slave;
3234
select * from t1 where id=1;
3335
id value value2
3436
1 1 100
@@ -38,5 +40,6 @@ id value value2
3840
select * from t1 where id=3;
3941
id value value2
4042
3 1 300
43+
connection master;
4144
drop table t1;
4245
include/rpl_end.inc
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
11
!include suite/rpl/my.cnf
2-
3-
[mysqld.1]
4-
binlog_format=row
5-
[mysqld.2]
6-
binlog_format=row
7-

storage/rocksdb/mysql-test/rocksdb/t/rpl_row_rocksdb.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--source include/have_rocksdb.inc
22

33
source include/master-slave.inc;
4+
source include/have_binlog_format_row.inc;
45

56
connection master;
67
--disable_warnings

0 commit comments

Comments
 (0)