Commit 5a340eea authored by mattiasj@client-10-129-10-147.upp.off.mysql.com's avatar mattiasj@client-10-129-10-147.upp.off.mysql.com
Browse files

Merge client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam 

into  client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam
parents 8c7b197a 1eb8991a

mysql-test/suite/rpl/r/rpl_sp.result

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ fetch c into var; 
close c;

return var;

end

master-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 as a

master-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `a`

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `test`; insert into t1 (a) values (f1())

master-bin.000001	#	Query	1	#	use `test`; drop view v1

mysql-test/suite/rpl/r/rpl_view.result

+14 −0
Original line number Diff line number Diff line
@@ -101,4 +101,18 @@ CREATE VIEW v1 AS SELECT * FROM t1; 
ERROR 42S01: Table 'v1' already exists

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (a INT);

# create view as output from mysqldump 10.11 (5.0.62)

/*!50001 CREATE ALGORITHM=UNDEFINED */

/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */

/*!50001 VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) */

/*!50002 WITH CASCADED CHECK OPTION */;

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) WITH CASCADED CHECK OPTION

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) WITH CASCADED CHECK OPTION

DROP VIEW v1;

DROP TABLE t1;

End of 5.0 tests

mysql-test/suite/rpl/t/rpl_view.test

+18 −0
Original line number Diff line number Diff line
@@ -164,4 +164,22 @@ DROP VIEW v1; 
DROP TABLE t1;

sync_slave_with_master;



#

# Bug#32575 Parse error of stmt with extended comments on slave side

# Verify that 'CREATE VIEW' with comments is properly logged to binlog

connection master;

CREATE TABLE t1 (a INT);

--echo # create view as output from mysqldump 10.11 (5.0.62)

/*!50001 CREATE ALGORITHM=UNDEFINED */

/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */

/*!50001 VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) */

/*!50002 WITH CASCADED CHECK OPTION */;

SHOW CREATE VIEW v1;

sync_slave_with_master;

SHOW CREATE VIEW v1;

connection master;

DROP VIEW v1;

DROP TABLE t1;

sync_slave_with_master;



--echo End of 5.0 tests