bzr commit into mysql-5.1-bugteam branch (Georgi.Kodinov:3526)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/merge-5.1-bugteam/ based on revid:georgi.kodinov@stripped

 3526 Georgi Kodinov	2010-12-17
      post-merge test suite update

    modified:
      mysql-test/suite/binlog/r/binlog_unsafe.result
=== modified file 'mysql-test/suite/binlog/r/binlog_unsafe.result'
--- a/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-01-13 09:00:03 +0000
+++ b/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-12-17 08:20:44 +0000
@@ -28,6 +28,7 @@ Warnings:
 Note	1592	Statement may not be safe to log in statement format.
 INSERT INTO t2 VALUES (@@hostname);
 Warnings:
+Warning	1265	Data truncated for column 'a' at row 1
 Note	1592	Statement may not be safe to log in statement format.
 ---- Insert from stored procedure ----
 CREATE PROCEDURE proc()
@@ -48,6 +49,7 @@ Note	1592	Statement may not be safe to l
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
+Warning	1265	Data truncated for column 'a' at row 6
 Note	1592	Statement may not be safe to log in statement format.
 ---- Insert from stored function ----
 CREATE FUNCTION func()
@@ -72,6 +74,7 @@ Note	1592	Statement may not be safe to l
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
+Warning	1265	Data truncated for column 'a' at row 6
 Note	1592	Statement may not be safe to log in statement format.
 ---- Insert from trigger ----
 CREATE TRIGGER trig
@@ -94,6 +97,7 @@ Note	1592	Statement may not be safe to l
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
+Warning	1265	Data truncated for column 'a' at row 6
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
 ---- Insert from prepared statement ----
@@ -124,6 +128,7 @@ Warnings:
 Note	1592	Statement may not be safe to log in statement format.
 EXECUTE p7;
 Warnings:
+Warning	1265	Data truncated for column 'a' at row 1
 Note	1592	Statement may not be safe to log in statement format.
 ---- Insert from nested call of triggers / functions / procedures ----
 CREATE PROCEDURE proc1()
@@ -160,6 +165,7 @@ Note	1592	Statement may not be safe to l
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
 Note	1592	Statement may not be safe to log in statement format.
+Warning	1265	Data truncated for column 'a' at row 6
 Note	1592	Statement may not be safe to log in statement format.
 ==== Variables that should *not* be unsafe ====
 INSERT INTO t1 VALUES (@@session.pseudo_thread_id);
@@ -303,6 +309,8 @@ INSERT INTO t2 VALUES (@@global.init_sla
 INSERT INTO t2 VALUES (@@hostname);
 END|
 INSERT INTO trigger_table VALUES ('bye.');
+Warnings:
+Warning	1265	Data truncated for column 'a' at row 6
 DROP FUNCTION fun_check_log_bin;
 DROP FUNCTION func6;
 DROP FUNCTION func7;


Attachment: [text/bzr-bundle] bzr/[e-mail]