diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-24 19:21:27 +0200 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi> | 2007-03-24 19:21:27 +0200 |
| commit | 21af9a55dd6b84b22e3ded4c8336330798bd225e (patch) | |
| tree | cea6777dc0fe040bf991d688193386b1448e0b3f /mysql-test | |
| parent | 99d1dee47301ba8313dd6fadeaabedcf60c38d27 (diff) | |
| parent | ae7283a64b4cbecb9c638979fe63e68d222b2fa1 (diff) | |
| download | mariadb-git-21af9a55dd6b84b22e3ded4c8336330798bd225e.tar.gz | |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp_trans.result | 14 | ||||
| -rw-r--r-- | mysql-test/t/sp_trans.test | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result index 57c73bea86e..f09645703ba 100644 --- a/mysql-test/r/sp_trans.result +++ b/mysql-test/r/sp_trans.result @@ -534,7 +534,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| -reset master| insert into t2 values (1,1)| create function bug23333() RETURNS int(11) @@ -544,20 +543,11 @@ insert into t1 values (null); select count(*) from t1 into @a; return @a; end| +reset master| insert into t2 values (bug23333(),1)| ERROR 23000: Duplicate entry '1' for key 1 -show binlog events from 98 /* must show the insert */| +show binlog events from 98 /* with fixes for #23333 will show there is the query */| Log_name Pos Event_type Server_id End_log_pos Info -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 -insert into t1 values (null); -select count(*) from t1 into @a; -return @a; -end select count(*),@a from t1 /* must be 1,1 */| count(*) @a 1 1 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 */| # |