post-merge fixes to make tests pass after merging BUG#39934 to 5.1-rep+3.

mysql-test/r/sp_trans.result

@@ -506,8 +506,6 @@ select count(*)*255 from t3 into table_size;
 until table_size > max_table_size*2 end repeat;
 end|
 call bug14210_fill_table()|
-Warnings:
-Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason: Statement uses a system variable whose value may differ on slave.
 drop procedure bug14210_fill_table|
 create table t4 like t3|
 create procedure bug14210()

mysql-test/t/sp_trans.test

@@ -527,7 +527,9 @@ begin
     select count(*)*255 from t3 into table_size;
   until table_size > max_table_size*2 end repeat;
 end|
+--disable_warnings
 call bug14210_fill_table()|
+--enable_warnings
 drop procedure bug14210_fill_table|
 create table t4 like t3|