bk commit into 5.1 tree (aelkin:1.2582) BUG#27395

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of aelkin. When aelkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-16 19:20:46+02:00, aelkin@stripped +2 -0
  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@stripped, 2007-04-16 19:20:43+02:00, aelkin@stripped +1 -2
    changed

  mysql-test/t/sp_trans_log.test@stripped, 2007-04-16 19:20:43+02:00, aelkin@stripped +1 -0
    innodb activated

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dl145j.mysql.com
# Root:	/tmp/andrei/mysql-5.1-marvel

--- 1.1/mysql-test/r/sp_trans_log.result	2007-04-16 19:20:52 +02:00
+++ 1.2/mysql-test/r/sp_trans_log.result	2007-04-16 19:20:52 +02:00
@@ -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_lo
 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

--- 1.1/mysql-test/t/sp_trans_log.test	2007-04-16 19:20:53 +02:00
+++ 1.2/mysql-test/t/sp_trans_log.test	2007-04-16 19:20:53 +02:00
@@ -1,4 +1,5 @@
 # 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 |;