From: He Zhenxing Date: May 20 2009 10:28am Subject: bzr commit into mysql-5.1-bugteam branch (zhenxing.he:2895) Bug#42415 List-Archive: http://lists.mysql.com/commits/74576 X-Bug: 42415 Message-Id: <200905201028.n4KASxWX020569@hezx-dev.localdomain> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4600174315033624309==" --===============4600174315033624309== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///media/sdb2/hezx/work/mysql/bzrwork/b42415/5.1-bugteam/ based on revid:zhenxing.he@stripped 2895 He Zhenxing 2009-05-20 Post fix of result file after push of BUG#42415 M mysql-test/suite/binlog/r/binlog_stm_ps.result M mysql-test/suite/binlog/r/binlog_unsafe.result M mysql-test/suite/binlog/t/binlog_unsafe.test M mysql-test/suite/rpl/r/rpl_stm_loadfile.result M mysql-test/suite/rpl/r/rpl_udf.result === modified file 'mysql-test/suite/binlog/r/binlog_stm_ps.result' --- a/mysql-test/suite/binlog/r/binlog_stm_ps.result 2009-04-03 18:21:57 +0000 +++ b/mysql-test/suite/binlog/r/binlog_stm_ps.result 2009-05-20 10:28:43 +0000 @@ -11,7 +11,7 @@ prepare s from "insert into t1 select 10 set @a=100; execute s using @a; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) === modified file 'mysql-test/suite/binlog/r/binlog_unsafe.result' --- a/mysql-test/suite/binlog/r/binlog_unsafe.result 2009-04-03 18:21:57 +0000 +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result 2009-05-20 10:28:43 +0000 @@ -10,25 +10,25 @@ INSERT DELAYED INTO t1 VALUES (5); ---- Insert directly ---- INSERT INTO t1 VALUES (@@global.sync_binlog); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t1 VALUES (@@session.insert_id); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t1 VALUES (@@global.auto_increment_increment); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t2 SELECT UUID(); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t2 VALUES (@@session.sql_mode); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t2 VALUES (@@global.init_slave); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t2 VALUES (@@hostname); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. ---- Insert from stored procedure ---- CREATE PROCEDURE proc() BEGIN @@ -42,13 +42,13 @@ INSERT INTO t2 VALUES (@@hostname); END| CALL proc(); Warnings: -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not 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. +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. +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 stored function ---- CREATE FUNCTION func() RETURNS INT @@ -66,13 +66,13 @@ SELECT func(); func() 0 Warnings: -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not 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. +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. +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 trigger ---- CREATE TRIGGER trig BEFORE INSERT ON trigger_table @@ -88,14 +88,14 @@ INSERT INTO t2 VALUES (@@hostname); END| INSERT INTO trigger_table VALUES ('bye.'); Warnings: -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not 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. +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. +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. ---- Insert from prepared statement ---- PREPARE p1 FROM 'INSERT INTO t1 VALUES (@@global.sync_binlog)'; PREPARE p2 FROM 'INSERT INTO t1 VALUES (@@session.insert_id)'; @@ -106,25 +106,25 @@ PREPARE p6 FROM 'INSERT INTO t2 VALUES ( PREPARE p7 FROM 'INSERT INTO t2 VALUES (@@hostname)'; EXECUTE p1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p2; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p3; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p4; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p5; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p6; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. EXECUTE p7; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. ---- Insert from nested call of triggers / functions / procedures ---- CREATE PROCEDURE proc1() INSERT INTO trigger_table VALUES ('ha!')| @@ -154,13 +154,13 @@ EXECUTE prep6; func5() 0 Warnings: -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not 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. +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. +Note 1592 Statement may not be safe to log in statement format. +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); INSERT INTO t1 VALUES (@@session.pseudo_thread_id); @@ -195,16 +195,16 @@ DROP TABLE t1, t2, t3, trigger_table, tr CREATE TABLE t1(a INT, b INT, KEY(a), PRIMARY KEY(b)); INSERT INTO t1 SELECT * FROM t1 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. REPLACE INTO t1 SELECT * FROM t1 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. UPDATE t1 SET a=1 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. DELETE FROM t1 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. CREATE PROCEDURE p1() BEGIN INSERT INTO t1 SELECT * FROM t1 LIMIT 1; @@ -214,10 +214,10 @@ DELETE FROM t1 LIMIT 1; END| CALL p1(); Warnings: -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not safe to log in statement format. -Note 1592 Statement is not 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. +Note 1592 Statement may not be safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. DROP PROCEDURE p1; DROP TABLE t1; DROP TABLE IF EXISTS t1; @@ -225,16 +225,16 @@ CREATE TABLE t1 (a VARCHAR(100), b VARCH INSERT INTO t1 VALUES ('a','b'); UPDATE t1 SET b = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s' WHERE a = 'a' LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. DROP TABLE t1; DROP TABLE IF EXISTS t1, t2; CREATE TABLE t1(i INT PRIMARY KEY); CREATE TABLE t2(i INT PRIMARY KEY); CREATE TABLE t3(i INT, ch CHAR(50)); -"Should issue message Statement is not safe to log in statement format." +"Should issue message Statement may not be safe to log in statement format." INSERT INTO t1 SELECT * FROM t2 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. CREATE FUNCTION func6() RETURNS INT BEGIN @@ -243,10 +243,10 @@ INSERT INTO t1 VALUES (11); INSERT INTO t1 VALUES (12); RETURN 0; END| -"Should issue message Statement is not safe to log in statement format only once" +"Should issue message Statement may not be safe to log in statement format only once" INSERT INTO t3 VALUES(func6(), UUID()); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. "Check whether SET @@SQL_LOG_BIN = 0/1 doesn't work in substatements" CREATE FUNCTION fun_check_log_bin() RETURNS INT BEGIN @@ -259,7 +259,7 @@ SELECT fun_check_log_bin(); fun_check_log_bin() 100 Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. "SQL_LOG_BIN should be ON still" SHOW VARIABLES LIKE "SQL_LOG_BIN"; Variable_name Value @@ -315,16 +315,16 @@ CREATE TABLE t1(i INT PRIMARY KEY); CREATE TABLE t2(i INT PRIMARY KEY); INSERT INTO t1 SELECT * FROM t2 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. INSERT INTO t1 VALUES(@@global.sync_binlog); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. UPDATE t1 SET i = 999 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. DELETE FROM t1 LIMIT 1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. DROP TABLE t1, t2; SET @@SESSION.SQL_MODE = @save_sql_mode; "End of tests" === modified file 'mysql-test/suite/binlog/t/binlog_unsafe.test' --- a/mysql-test/suite/binlog/t/binlog_unsafe.test 2009-04-03 18:21:57 +0000 +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test 2009-05-20 10:28:43 +0000 @@ -289,7 +289,7 @@ CREATE TABLE t1(i INT PRIMARY KEY); CREATE TABLE t2(i INT PRIMARY KEY); CREATE TABLE t3(i INT, ch CHAR(50)); ---echo "Should issue message Statement is not safe to log in statement format." +--echo "Should issue message Statement may not be safe to log in statement format." INSERT INTO t1 SELECT * FROM t2 LIMIT 1; DELIMITER |; @@ -302,7 +302,7 @@ BEGIN RETURN 0; END| DELIMITER ;| ---echo "Should issue message Statement is not safe to log in statement format only once" +--echo "Should issue message Statement may not be safe to log in statement format only once" INSERT INTO t3 VALUES(func6(), UUID()); --echo "Check whether SET @@SQL_LOG_BIN = 0/1 doesn't work in substatements" === modified file 'mysql-test/suite/rpl/r/rpl_stm_loadfile.result' --- a/mysql-test/suite/rpl/r/rpl_stm_loadfile.result 2009-04-03 18:21:57 +0000 +++ b/mysql-test/suite/rpl/r/rpl_stm_loadfile.result 2009-05-20 10:28:43 +0000 @@ -10,7 +10,7 @@ CREATE TABLE test.t1 (a INT, blob_column INSERT INTO test.t1 VALUES(1,'test'); UPDATE test.t1 SET blob_column=LOAD_FILE('../../std_data/words2.dat') WHERE a=1; Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. create procedure test.p1() begin INSERT INTO test.t1 VALUES(2,'test'); @@ -18,7 +18,7 @@ UPDATE test.t1 SET blob_column=LOAD_FILE end| CALL test.p1(); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. SELECT * FROM test.t1 ORDER BY blob_column; a blob_column 1 abase === modified file 'mysql-test/suite/rpl/r/rpl_udf.result' --- a/mysql-test/suite/rpl/r/rpl_udf.result 2009-04-03 18:21:57 +0000 +++ b/mysql-test/suite/rpl/r/rpl_udf.result 2009-05-20 10:28:43 +0000 @@ -182,19 +182,19 @@ CREATE TABLE t1(sum INT, price FLOAT(24) affected rows: 0 INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00)); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. affected rows: 1 INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00)); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. affected rows: 1 INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00)); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. affected rows: 1 INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00)); Warnings: -Note 1592 Statement is not safe to log in statement format. +Note 1592 Statement may not be safe to log in statement format. affected rows: 1 SELECT * FROM t1 ORDER BY sum; sum price --===============4600174315033624309== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/zhenxing.he@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: zhenxing.he@stripped # target_branch: file:///media/sdb2/hezx/work/mysql/bzrwork/b42415\ # /5.1-bugteam/ # testament_sha1: 08db544914ee50d694fa0758ba1e8ac2430d8134 # timestamp: 2009-05-20 18:28:59 +0800 # source_branch: bzr+ssh://zhe@stripped/bzrroot/server\ # /mysql-5.1-bugteam/ # base_revision_id: zhenxing.he@stripped\ # jv59zhwmwky1wl0n # # Begin bundle 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 --===============4600174315033624309==--