mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge 5.0 -> 5.1 of fix for Bug 43546
Several 5.0 tests do not pass MTR's --check option (moved from Bug 42308)
This commit is contained in:
commit
7a21958d7f
1 changed files with 6 additions and 6 deletions
|
@ -8,17 +8,17 @@
|
||||||
delimiter |;
|
delimiter |;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bug #13270 INSERT,UPDATE,etc that calls func with side-effect does not binlog
|
# Bug#13270 INSERT,UPDATE,etc that calls func with side-effect does not binlog
|
||||||
# Bug #23333 stored function + non-transac table + transac table =
|
# Bug#23333 stored function + non-transac table + transac table =
|
||||||
# breaks stmt-based binlog
|
# breaks stmt-based binlog
|
||||||
# Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
|
# Bug#27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
|
||||||
#
|
#
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop function if exists bug23333|
|
drop function if exists bug23333|
|
||||||
drop table if exists t1,t2|
|
drop table if exists t1,t2|
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
CREATE TABLE t1 (a int NOT NULL auto_increment primary key) ENGINE=MyISAM|
|
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|
|
CREATE TABLE t2 (a int NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|
|
||||||
|
|
||||||
insert into t2 values (1,1)|
|
insert into t2 values (1,1)|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue