Skip to content

Commit 151aa17

Browse files
author
holyfoot/hf@mysql.com/hfmain.(none)
committed
bug #26538 (flush2.test fails in embedded run)
in the embedded result we don't have 'log_slave_updates OFF' line as replication is disabled in the embedded server. As we don't need to check for log_slave_updates variable in this test, we can not to SHOW it at all
1 parent 7ffb94e commit 151aa17

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

mysql-test/r/flush2.result

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
flush logs;
22
set global expire_logs_days = 3;
3-
show variables like 'log%';
3+
show variables like 'log_bin%';
44
Variable_name Value
5-
log ON
65
log_bin OFF
76
log_bin_trust_function_creators ON
8-
log_error
9-
log_output TABLE
10-
log_queries_not_using_indexes OFF
11-
log_slave_updates OFF
12-
log_slow_queries OFF
13-
log_warnings 1
147
flush logs;
15-
show variables like 'log%';
8+
show variables like 'log_bin%';
169
Variable_name Value
17-
log ON
1810
log_bin OFF
1911
log_bin_trust_function_creators ON
20-
log_error
21-
log_output TABLE
22-
log_queries_not_using_indexes OFF
23-
log_slave_updates OFF
24-
log_slow_queries OFF
25-
log_warnings 1
2612
set global expire_logs_days = 0;

mysql-test/t/flush2.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
flush logs;
55
set global expire_logs_days = 3;
6-
show variables like 'log%';
6+
show variables like 'log_bin%';
77
flush logs;
8-
show variables like 'log%';
8+
show variables like 'log_bin%';
99
set global expire_logs_days = 0;

0 commit comments

Comments
 (0)