bk commit into 6.0 tree (mkindahl:1.2558)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl.  When mkindahl 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, 2008-02-12 19:35:40+01:00, mkindahl@stripped +2 -0
  Updating result files after merge.

  mysql-test/suite/binlog/r/binlog_row_binlog.result@stripped, 2008-02-12 19:35:23+01:00, mkindahl@stripped +0 -2
    Result change.

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@stripped, 2008-02-12 19:35:29+01:00, mkindahl@stripped +1 -3
    Result change.

diff -Nrup a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result	2008-02-12 11:10:28 +01:00
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result	2008-02-12 19:35:23 +01:00
@@ -1079,8 +1079,6 @@ prepare stmt from "insert into t1 values
 set @a= 9999999999999999;
 set @b= 14632475938453979136;
 execute stmt using @a, @b;
-Warnings:
-Warning	1264	Out of range value for column 'b' at row 1
 deallocate prepare stmt;
 drop table t1;
 show binlog events from 0;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2008-02-12 11:10:34 +01:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2008-02-12 19:35:29 +01:00
@@ -586,15 +586,13 @@ prepare stmt from "insert into t1 values
 set @a= 9999999999999999;
 set @b= 14632475938453979136;
 execute stmt using @a, @b;
-Warnings:
-Warning	1264	Out of range value for column 'b' at row 1
 deallocate prepare stmt;
 drop table t1;
 show binlog events from 0;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
 master-bin.000001	107	Query	1	228	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
-master-bin.000001	228	Query	1	352	use `test`; insert into t1 values (9999999999999999,-3814268135255572480)
+master-bin.000001	228	Query	1	352	use `test`; insert into t1 values (9999999999999999,14632475938453979136)
 master-bin.000001	352	Query	1	428	use `test`; drop table t1
 End of 5.0 tests
 reset master;