summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp_trans.test
diff options
context:
space:
mode:
authorunknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi>2007-03-24 19:20:00 +0200
committerunknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi>2007-03-24 19:20:00 +0200
commitae7283a64b4cbecb9c638979fe63e68d222b2fa1 (patch)
tree7b99ba7b1b103556a5da5af170ee23372a867686 /mysql-test/t/sp_trans.test
parent79bfd0b958f4bade19e0f49ae379b6502cc145fe (diff)
downloadmariadb-git-ae7283a64b4cbecb9c638979fe63e68d222b2fa1.tar.gz
Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
removing test host sensitive stuff for pushbuild 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
Diffstat (limited to 'mysql-test/t/sp_trans.test')
-rw-r--r--mysql-test/t/sp_trans.test6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test
index f2ed39c093e..d9b34c303ae 100644
--- a/mysql-test/t/sp_trans.test
+++ b/mysql-test/t/sp_trans.test
@@ -566,7 +566,6 @@ 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|
-reset master|
insert into t2 values (1,1)|
create function bug23333()
@@ -578,10 +577,11 @@ begin
return @a;
end|
+reset master|
--error ER_DUP_ENTRY
insert into t2 values (bug23333(),1)|
---replace_column 2 # 5 #
-show binlog events from 98 /* must show the insert */|
+--replace_column 2 # 5 # 6 #
+show binlog events from 98 /* with fixes for #23333 will show there is the query */|
select count(*),@a from t1 /* must be 1,1 */|
#