Skip to content

Commit 9f7dc2b

Browse files
committed
MariaRocks port: make rocksdb.rpl_savepoint pass
Run it only with binlog_format=row, update test result
1 parent 2422483 commit 9f7dc2b

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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
create table t1 (id int primary key, value int);
87
insert into t1 values (1,1), (2,2), (3,3);
98
begin;
@@ -21,11 +20,13 @@ id value
2120
2 2
2221
3 3
2322
include/sync_slave_sql_with_master.inc
23+
connection slave;
2424
select * from t1;
2525
id value
2626
1 1
2727
2 2
2828
3 3
29+
connection master;
2930
begin;
3031
insert into t1 values (21, 1);
3132
savepoint a;
@@ -43,11 +44,13 @@ id value
4344
2 2
4445
3 3
4546
include/sync_slave_sql_with_master.inc
47+
connection slave;
4648
select * from t1;
4749
id value
4850
1 1
4951
2 2
5052
3 3
53+
connection master;
5154
begin;
5255
insert into t1 values (31, 1);
5356
savepoint a;
@@ -65,11 +68,13 @@ id value
6568
2 2
6669
3 3
6770
include/sync_slave_sql_with_master.inc
71+
connection slave;
6872
select * from t1;
6973
id value
7074
1 1
7175
2 2
7276
3 3
77+
connection master;
7378
SET autocommit=off;
7479
select * from t1;
7580
id value
@@ -94,10 +99,12 @@ id value
9499
2 2
95100
3 3
96101
include/sync_slave_sql_with_master.inc
102+
connection slave;
97103
select * from t1;
98104
id value
99105
1 1
100106
2 2
101107
3 3
108+
connection master;
102109
drop table t1;
103110
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_savepoint.test

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

3+
source include/have_binlog_format_row.inc;
34
source include/master-slave.inc;
45

56
connection master;

0 commit comments

Comments
 (0)