Commit b35b11ee authored by unknown's avatar unknown
Browse files

Post Merge Cleanup. 


mysql-test/r/mysqldump.result:
  Post Merge Cleanup
parent 7c27a05a

mysql-test/r/mysqldump.result

+23 −23
Original line number Diff line number Diff line
@@ -3205,29 +3205,6 @@ INSERT INTO t1 VALUES(1,0xff00fef0); 
</mysqldump>

DROP TABLE t1;

#

# Bug #23491: MySQLDump prefix function call in a view by database name

#

create database bug23491_original;

create database bug23491_restore;

use bug23491_original;

create table t1 (c1 int);

create view v1 as select * from t1;

create procedure p1() select 1;

create function f1() returns int return 1;

create view v2 as select f1();

create function f2() returns int return f1();

create view v3 as select bug23491_original.f1();

use bug23491_restore;

show create view bug23491_restore.v2;

View	Create View

v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `f1`() AS `f1()`

show create view bug23491_restore.v3;

View	Create View

v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `bug23491_original`.`f1`() AS `bug23491_original.f1()`

drop database bug23491_original;

drop database bug23491_restore;

use test;

#

# Bug#26346:  	stack + buffer overrun in mysqldump

#

CREATE TABLE t1(a int);
@@ -3282,6 +3259,29 @@ UNLOCK TABLES; 


DROP TABLE t1, t2, t3;

#

# Bug #23491: MySQLDump prefix function call in a view by database name

#

create database bug23491_original;

create database bug23491_restore;

use bug23491_original;

create table t1 (c1 int);

create view v1 as select * from t1;

create procedure p1() select 1;

create function f1() returns int return 1;

create view v2 as select f1();

create function f2() returns int return f1();

create view v3 as select bug23491_original.f1();

use bug23491_restore;

show create view bug23491_restore.v2;

View	Create View

v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `f1`() AS `f1()`

show create view bug23491_restore.v3;

View	Create View

v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `bug23491_original`.`f1`() AS `bug23491_original.f1()`

drop database bug23491_original;

drop database bug23491_restore;

use test;

#

# End of 5.0 tests

#

drop table if exists t1;