1 files changed, 15 insertions, 7 deletions
diff --git a/mysql-test/t/rpl_sp.test b/mysql-test/t/rpl_sp.test
index b7a9036908c..0e0de7cf2e7 100644
--- a/mysql-test/t/rpl_sp.test
+++ b/mysql-test/t/rpl_sp.test
@@ -1,3 +1,5 @@
+# row-based and statement have expected binlog difference in result files
+
 # Test of replication of stored procedures (WL#2146 for MySQL 5.0)
 # Modified by WL#2971.
 
@@ -6,6 +8,7 @@
 # still accepted (this test also checks that the new name is
 # accepted). The old name could be removed in 5.1 or 6.0.
 
+source include/have_binlog_format_mixed.inc;
 source include/master-slave.inc;
 
 # we need a db != test, where we don't have automatic grants
@@ -317,7 +320,9 @@ select * from t2;
 # ********************** PART 3 : TRIGGERS ***************
 
 connection con1;
---error 1227
+# now fails due to missing trigger grant (err 1142 i/o 1227) due to new
+# check in sql_trigger.cc (v1.44) by anozdrin on 2006/02/01  --azundris
+--error ER_TABLEACCESS_DENIED_ERROR
 create trigger trg before insert on t1 for each row set new.a= 10;
 
 connection master;
@@ -339,7 +344,8 @@ drop trigger trg;
 insert into t1 values (1);
 select * from t1;
 --replace_column 2 # 5 #
-show binlog events in 'master-bin.000001' from 98;
+--replace_regex /table_id: [0-9]+/table_id: #/
+show binlog events in 'master-bin.000001' from 102;
 sync_slave_with_master;
 select * from t1;
 
@@ -425,14 +431,10 @@ CALL p1('test');
 SELECT * FROM t1;
 
 sync_slave_with_master;
-connection slave;
-
 SELECT * FROM t1;
 
-# Cleanup.
-
+# Cleanup
 connection master;
-
 DROP PROCEDURE p1;
 
 
@@ -520,6 +522,10 @@ connection master;
 drop table t1;
 sync_slave_with_master;
 
+# Restore log_bin_trust_function_creators to original value
+set global log_bin_trust_function_creators=0;
+connection master;
+set global log_bin_trust_function_creators=0;
 #
 # Bug22043: MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
 #
@@ -540,5 +546,7 @@ create procedure `\\`.test() begin end;
 # Clean up
 drop database mysqltest;
 drop database mysqltest2;
+--echo End of 5.0 tests
 
+--echo End of 5.1 tests