bk commit into 5.1 tree (tulin:1.1943)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.1943 05/06/07 20:30:05 tulin@stripped +2 -0
  date_formats.test, date_formats.result:
    made testcase independent on binlog format

  mysql-test/t/date_formats.test
    1.13 05/06/07 20:29:48 tulin@stripped +3 -0
    made testcase independent on binlog format

  mysql-test/r/date_formats.result
    1.18 05/06/07 20:29:35 tulin@stripped +3 -3
    made testcase independent on binlog format

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325

--- 1.17/mysql-test/r/date_formats.result	Fri Apr 15 09:08:59 2005
+++ 1.18/mysql-test/r/date_formats.result	Tue Jun  7 20:29:35 2005
@@ -1,14 +1,14 @@
 drop table if exists t1;
 SHOW GLOBAL VARIABLES LIKE "%_format%";
 Variable_name	Value
-binlog_format	row
+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%";
 Variable_name	Value
-binlog_format	row
+binlog_format	<format>
 date_format	%d.%m.%Y
 datetime_format	%Y-%m-%d %H:%i:%s
 default_week_format	0
@@ -32,7 +32,7 @@
 set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
 SHOW SESSION VARIABLES LIKE "%format";
 Variable_name	Value
-binlog_format	row
+binlog_format	<format>
 date_format	%m-%d-%Y
 datetime_format	%h:%i:%s.%f %p %Y-%m-%d
 default_week_format	0

--- 1.12/mysql-test/t/date_formats.test	Wed Mar 30 15:00:27 2005
+++ 1.13/mysql-test/t/date_formats.test	Tue Jun  7 20:29:48 2005
@@ -6,7 +6,9 @@
 drop table if exists t1;
 --enable_warnings
 
+--replace_result row <format> statement <format>
 SHOW GLOBAL VARIABLES LIKE "%_format%";
+--replace_result row <format> statement <format>
 SHOW SESSION VARIABLES LIKE "%_format%";
 
 #
@@ -34,6 +36,7 @@
 set datetime_format= '%h:%i:%s %p %Y-%m-%d';
 set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
 
+--replace_result row <format> statement <format>
 SHOW SESSION VARIABLES LIKE "%format";
 
 --error 1231