From 151aa17bfe533c05e16d89f2e5202130bcd12720 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Mon, 5 Mar 2007 02:09:24 +0400
Subject: [PATCH] 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
---
 mysql-test/r/flush2.result | 18 ++----------------
 mysql-test/t/flush2.test   |  4 ++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/mysql-test/r/flush2.result b/mysql-test/r/flush2.result
index 8257fa05b41..13bcc371ef6 100644
--- a/mysql-test/r/flush2.result
+++ b/mysql-test/r/flush2.result
@@ -1,26 +1,12 @@
 flush logs;
 set global expire_logs_days = 3;
-show variables like 'log%';
+show variables like 'log_bin%';
 Variable_name	Value
-log	ON
 log_bin	OFF
 log_bin_trust_function_creators	ON
-log_error	
-log_output	TABLE
-log_queries_not_using_indexes	OFF
-log_slave_updates	OFF
-log_slow_queries	OFF
-log_warnings	1
 flush logs;
-show variables like 'log%';
+show variables like 'log_bin%';
 Variable_name	Value
-log	ON
 log_bin	OFF
 log_bin_trust_function_creators	ON
-log_error	
-log_output	TABLE
-log_queries_not_using_indexes	OFF
-log_slave_updates	OFF
-log_slow_queries	OFF
-log_warnings	1
 set global expire_logs_days = 0;
diff --git a/mysql-test/t/flush2.test b/mysql-test/t/flush2.test
index fc9e88e3141..7582ab8426b 100644
--- a/mysql-test/t/flush2.test
+++ b/mysql-test/t/flush2.test
@@ -3,7 +3,7 @@
 #
 flush logs;
 set global expire_logs_days = 3;
-show variables like 'log%';
+show variables like 'log_bin%';
 flush logs;
-show variables like 'log%';
+show variables like 'log_bin%';
 set global expire_logs_days = 0;