bk commit into 5.1 tree (msvensson:1.2518) BUG#28369

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-06-07 19:20:49+02:00, msvensson@pilot.(none) +9 -0
  Bug#28369 rpl test cases fail with binlog disabled
   - Additional tests in 5.1 that need binlog
   - Mark more test to need binlog

  mysql-test/include/have_binlog_format_mixed.inc@stripped, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_mixed_or_row.inc@stripped, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_row.inc@stripped, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/include/have_binlog_format_statement.inc@stripped, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +2 -0
    Need binlog

  mysql-test/r/date_formats.result@stripped, 2007-06-07 19:20:47+02:00, msvensson@pilot.(none) +3 -9
    Show only the variables affected by the testcase to avoid it fails
    when running without binlog

  mysql-test/t/date_formats.test@stripped, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +3 -3
    Show only the variables affected by the testcase to avoid it fails
    when running without binlog

  mysql-test/t/ndb_binlog_basic2.test@stripped, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/ps.test@stripped, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +1 -0
    Need binlog

  mysql-test/t/rpl_sf.test@stripped, 2007-06-07 19:20:48+02:00, msvensson@pilot.(none) +2 -0
    Nedd binlog

# 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:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28369/my51-bug28369

--- 1.1/mysql-test/include/have_binlog_format_mixed.inc	2006-08-30 09:22:42 +02:00
+++ 1.2/mysql-test/include/have_binlog_format_mixed.inc	2007-06-07 19:20:47 +02:00
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
 -- require r/have_binlog_format_mixed.require
 disable_query_log;
 show variables like "binlog_format";

--- 1.42/mysql-test/r/date_formats.result	2007-05-16 12:49:36 +02:00
+++ 1.43/mysql-test/r/date_formats.result	2007-06-07 19:20:47 +02:00
@@ -1,17 +1,13 @@
 drop table if exists t1;
-SHOW GLOBAL VARIABLES LIKE "%_format%";
+SHOW GLOBAL VARIABLES LIKE "%e_format";
 Variable_name	Value
-binlog_format	<format>
 date_format	%d.%m.%Y
 datetime_format	%Y-%m-%d %H:%i:%s
-default_week_format	0
 time_format	%H.%i.%s
-SHOW SESSION VARIABLES LIKE "%_format%";
+SHOW SESSION VARIABLES LIKE "%e_format";
 Variable_name	Value
-binlog_format	<format>
 date_format	%d.%m.%Y
 datetime_format	%Y-%m-%d %H:%i:%s
-default_week_format	0
 time_format	%H.%i.%s
 SET time_format='%H%i%s';
 SET time_format='%H:%i:%s.%f';
@@ -30,12 +26,10 @@ set datetime_format= '%H:%i:%s %Y-%m-%d'
 set datetime_format= '%H:%i:%s.%f %m-%d-%Y';
 set datetime_format= '%h:%i:%s %p %Y-%m-%d';
 set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
-SHOW SESSION VARIABLES LIKE "%format";
+SHOW SESSION VARIABLES LIKE "%e_format";
 Variable_name	Value
-binlog_format	<format>
 date_format	%m-%d-%Y
 datetime_format	%h:%i:%s.%f %p %Y-%m-%d
-default_week_format	0
 time_format	%h:%i:%s%p
 SET time_format='%h:%i:%s';
 ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s'

--- 1.32/mysql-test/t/date_formats.test	2007-05-16 12:49:37 +02:00
+++ 1.33/mysql-test/t/date_formats.test	2007-06-07 19:20:48 +02:00
@@ -7,9 +7,9 @@ drop table if exists t1;
 --enable_warnings
 
 --replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW GLOBAL VARIABLES LIKE "%_format%";
+SHOW GLOBAL VARIABLES LIKE "%e_format";
 --replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW SESSION VARIABLES LIKE "%_format%";
+SHOW SESSION VARIABLES LIKE "%e_format";
 
 #
 # Test setting a lot of different formats to see which formats are accepted and
@@ -37,7 +37,7 @@ set datetime_format= '%h:%i:%s %p %Y-%m-
 set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
 
 --replace_result ROW <format> STATEMENT <format> MIXED <format>
-SHOW SESSION VARIABLES LIKE "%format";
+SHOW SESSION VARIABLES LIKE "%e_format";
 
 --error 1231
 SET time_format='%h:%i:%s';

--- 1.1/mysql-test/t/ndb_binlog_basic2.test	2006-02-25 22:20:55 +01:00
+++ 1.2/mysql-test/t/ndb_binlog_basic2.test	2007-06-07 19:20:48 +02:00
@@ -1,4 +1,5 @@
 -- source include/have_ndb.inc
+-- source include/have_log_bin.inc
 
 --error ER_NDB_CANT_SWITCH_BINLOG_FORMAT
 set session binlog_format=row;

--- 1.1/mysql-test/include/have_binlog_format_row.inc	2005-12-22 06:34:49 +01:00
+++ 1.2/mysql-test/include/have_binlog_format_row.inc	2007-06-07 19:20:47 +02:00
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
 -- require r/have_binlog_format_row.require
 disable_query_log;
 show variables like "binlog_format";

--- 1.1/mysql-test/include/have_binlog_format_statement.inc	2005-12-22 06:34:49 +01:00
+++ 1.2/mysql-test/include/have_binlog_format_statement.inc	2007-06-07 19:20:47 +02:00
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
 -- require r/have_binlog_format_statement.require
 disable_query_log;
 show variables like "binlog_format";

--- 1.1/mysql-test/include/have_binlog_format_mixed_or_row.inc	2006-06-22 21:44:17 +02:00
+++ 1.2/mysql-test/include/have_binlog_format_mixed_or_row.inc	2007-06-07 19:20:47 +02:00
@@ -1,3 +1,5 @@
+--source include/have_log_bin.inc
+
 --require r/have_binlog_format_row.require
 --disable_query_log
 --replace_result MIXED ROW

--- 1.116/mysql-test/t/ps.test	2007-05-24 20:53:14 +02:00
+++ 1.117/mysql-test/t/ps.test	2007-06-07 19:20:48 +02:00
@@ -1,4 +1,5 @@
 -- source include/not_embedded.inc
+-- source include/have_log_bin.inc
 #
 # SQL Syntax for Prepared Statements test
 #

--- 1.1/mysql-test/t/rpl_sf.test	2006-11-17 21:30:21 +01:00
+++ 1.2/mysql-test/t/rpl_sf.test	2007-06-07 19:20:48 +02:00
@@ -1,3 +1,5 @@
+-- source include/have_log_bin.inc
+
 # Bug#16456 RBR: rpl_sp.test expects query to fail, but passes in RBR
 
 # save status