Commit b6dd299d authored by unknown's avatar unknown
Browse files

postmerge-fix

parent 7dafc733

mysql-test/r/mysqldump.result

+12 −12
Original line number Diff line number Diff line
@@ -1543,13 +1543,13 @@ LOCK TABLES `t1` WRITE; 
UNLOCK TABLES;

/*!40000 ALTER TABLE `t1` ENABLE KEYS */;

DROP TABLE IF EXISTS `v1`;

DROP VIEW IF EXISTS `v1`;

CREATE TABLE `v1` (

/*!50001 DROP VIEW IF EXISTS `v1`*/;

/*!50001 CREATE TABLE `v1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `v1`;

DROP VIEW IF EXISTS `v1`;

CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1`;

) ENGINE=MyISAM DEFAULT CHARSET=latin1*/;

/*!50001 DROP TABLE IF EXISTS `v1`*/;

/*!50001 DROP VIEW IF EXISTS `v1`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1`*/;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1595,13 +1595,13 @@ INSERT INTO `t2` VALUES ('alfred'),('angie'),('bingo'),('waffle'),('lemon'); 
UNLOCK TABLES;

/*!40000 ALTER TABLE `t2` ENABLE KEYS */;

DROP TABLE IF EXISTS `v2`;

DROP VIEW IF EXISTS `v2`;

CREATE TABLE `v2` (

/*!50001 DROP VIEW IF EXISTS `v2`*/;

/*!50001 CREATE TABLE `v2` (

  `a` varchar(30) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

DROP TABLE IF EXISTS `v2`;

DROP VIEW IF EXISTS `v2`;

CREATE ALGORITHM=UNDEFINED VIEW `mysqldump_test_db`.`v2` AS select `mysqldump_test_db`.`t2`.`a` AS `a` from `mysqldump_test_db`.`t2` where (`mysqldump_test_db`.`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION;

) ENGINE=MyISAM DEFAULT CHARSET=latin1*/;

/*!50001 DROP TABLE IF EXISTS `v2`*/;

/*!50001 DROP VIEW IF EXISTS `v2`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED VIEW `mysqldump_test_db`.`v2` AS select `mysqldump_test_db`.`t2`.`a` AS `a` from `mysqldump_test_db`.`t2` where (`mysqldump_test_db`.`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION*/;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

mysql-test/r/trigger.result

+1 −8
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ drop table t1; 
set sql_mode='ansi';

create table t1 ("t1 column" int);

create trigger t1_bi before insert on t1 for each row set new."t1 column" = 5;

set sql_mode=default;

set sql_mode="";

insert into t1 values (0);

create trigger t1_af after insert on t1 for each row set @a=10;

insert into t1 values (0);
@@ -613,10 +613,6 @@ show triggers; 
Trigger	Event	Table	Statement	Timing	Created	sql_mode

t1_bi	INSERT	t1	set new."t1 column" = 5	BEFORE	#	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI

t1_af	INSERT	t1	 set @a=10	AFTER	#	

select * from information_schema.triggers;

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE

NULL	test	t1_bi	INSERT	NULL	test	t1	0	NULL	set new."t1 column" = 5	ROW	BEFORE	NULL	NULL	OLD	NEW	#	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI

NULL	test	t1_af	INSERT	NULL	test	t1	0	NULL	 set @a=10	ROW	AFTER	NULL	NULL	OLD	NEW	#	

drop table t1;

set sql_mode="traditional";

create table t1 (a date);
@@ -638,7 +634,4 @@ t1 CREATE TABLE `t1` ( 
show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode

t1_bi	INSERT	t1	 set new.a = '2004-01-00'	BEFORE	#	

select * from information_schema.triggers;

TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE

NULL	test	t1_bi	INSERT	NULL	test	t1	0	NULL	 set new.a = '2004-01-00'	ROW	BEFORE	NULL	NULL	OLD	NEW	#	

drop table t1;

mysql-test/t/trigger.test

+1 −5
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ drop table t1; 
set sql_mode='ansi';

create table t1 ("t1 column" int);

create trigger t1_bi before insert on t1 for each row set new."t1 column" = 5;

set sql_mode=default;

set sql_mode="";

insert into t1 values (0);

# create trigger with different sql_mode

create trigger t1_af after insert on t1 for each row set @a=10;
@@ -626,8 +626,6 @@ select * from t1; 
select @a;

--replace_column 6 #

show triggers;

--replace_column 17 #

select * from information_schema.triggers;

drop table t1;

# check that rigger preserve sql_mode during execution

set sql_mode="traditional";
@@ -643,6 +641,4 @@ set sql_mode=default; 
show create table t1;

--replace_column 6 #

show triggers;

--replace_column 17 #

select * from information_schema.triggers;

drop table t1;