Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()

refining the test with active innodb


mysql-test/r/sp_trans_log.result:
  changed
mysql-test/t/sp_trans_log.test:
  innodb activated

mysql-test/r/sp_trans_log.result

@@ -2,8 +2,6 @@ drop function if exists bug23333|
 drop table if exists t1,t2|
 CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|
 CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
-Warnings:
-Warning	1266	Using storage engine MyISAM for table 't2'
 insert into t2 values (1,1)|
 create function bug23333() 
 RETURNS int(11)
@@ -21,6 +19,7 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Table_map	1	#	#
 master-bin.000001	#	Table_map	1	#	#
 master-bin.000001	#	Write_rows	1	#	#
+master-bin.000001	#	Query	1	#	#
 select count(*),@a from t1 /* must be 1,1 */|
 count(*)	@a
 1	1

mysql-test/t/sp_trans_log.test

 # part of sp_trans test that appeared to be sensitive to binlog format
+--source include/have_innodb.inc
 --source include/have_binlog_format_mixed_or_row.inc
 
 delimiter |;