bk commit into 5.1 tree (holyfoot:1.2436) BUG#26538

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-05 02:09:24+04:00, holyfoot@stripped +2 -0
  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@stripped, 2007-03-05 02:09:21+04:00, holyfoot@stripped +2 -16
    result fixed

  mysql-test/t/flush2.test@stripped, 2007-03-05 02:09:21+04:00, holyfoot@stripped +2 -2
    here we only need to check for log_bin% variables

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/26538/my51-26538

--- 1.2/mysql-test/r/flush2.result	2007-03-05 02:09:29 +04:00
+++ 1.3/mysql-test/r/flush2.result	2007-03-05 02:09:29 +04:00
@@ -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;

--- 1.1/mysql-test/t/flush2.test	2007-03-05 02:09:29 +04:00
+++ 1.2/mysql-test/t/flush2.test	2007-03-05 02:09:29 +04:00
@@ -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;