diff options
| author | unknown <aelkin/elkin@andrepl.(none)> | 2007-03-24 14:40:38 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@andrepl.(none)> | 2007-03-24 14:40:38 +0200 |
| commit | d18945535d24107c865239d7c3f071e98f5cd31b (patch) | |
| tree | 03fc4240d30690ef9dd7baaa041aff75242bc5db /mysql-test | |
| parent | 7b41fd46d46bab8c299fa9cf31c21c65177aec0c (diff) | |
| download | mariadb-git-d18945535d24107c865239d7c3f071e98f5cd31b.tar.gz | |
Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
eliminating the unnecessary option; and replacing site-dependant stuff in the test
mysql-test/r/sp_trans.result:
results changed, will be changed again after bug#23333 fixed
mysql-test/t/sp_trans.test:
replacing sensitive stuff
sql/mysql_priv.h:
removal, as part of Bug#27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp_trans.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/sp_trans.test | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result index 513bbc43ce3..57c73bea86e 100644 --- a/mysql-test/r/sp_trans.result +++ b/mysql-test/r/sp_trans.result @@ -546,12 +546,11 @@ return @a; end| insert into t2 values (bug23333(),1)| ERROR 23000: Duplicate entry '1' for key 1 -show binlog events /* must show the insert */| +show binlog events from 98 /* must show the insert */| Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 98 Server ver: 5.0.40-debug-log, Binlog ver: 4 -master-bin.000001 98 Query 1 90 use `test`; insert into t2 values (1,1) -master-bin.000001 188 Xid 1 215 COMMIT /* xid=1165 */ -master-bin.000001 215 Query 1 446 use `test`; CREATE DEFINER=`root`@`localhost` function bug23333() +master-bin.000001 # Query 1 # use `test`; insert into t2 values (1,1) +master-bin.000001 # Xid 1 # COMMIT /* xid=1165 */ +master-bin.000001 # Query 1 # use `test`; CREATE DEFINER=`root`@`localhost` function bug23333() RETURNS int(11) DETERMINISTIC begin diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test index 579af44f28d..f2ed39c093e 100644 --- a/mysql-test/t/sp_trans.test +++ b/mysql-test/t/sp_trans.test @@ -580,7 +580,8 @@ end| --error ER_DUP_ENTRY insert into t2 values (bug23333(),1)| -show binlog events /* must show the insert */| +--replace_column 2 # 5 # +show binlog events from 98 /* must show the insert */| select count(*),@a from t1 /* must be 1,1 */| # |