Commit 46375759 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

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

test change for 5.1+ (show create view adds two columns in 5.1)

Patch only for 5.1+
parent 5a340eea

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

+4 −4
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ CREATE TABLE t1 (a INT); 
/*!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

View	Create View	character_set_client	collation_connection

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	latin1	latin1_swedish_ci

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

View	Create View	character_set_client	collation_connection

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	latin1	latin1_swedish_ci

DROP VIEW v1;

DROP TABLE t1;

End of 5.0 tests