bk commit into 5.1 tree (mattiasj:1.2616) BUG#32575

[mattiasj]

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj.  When mattiasj does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-08 14:02:09+02:00,
mattiasj@stripped +2 -0
  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+

  mysql-test/suite/rpl/r/rpl_sp.result@stripped, 2008-05-08 14:02:08+02:00,
mattiasj@stripped +1 -1
    restored the original 5.1 test result

  mysql-test/suite/rpl/r/rpl_view.result@stripped, 2008-05-08 14:02:08+02:00,
mattiasj@stripped +4 -4
    Bug#32575: Parse error of stmt with extended comments on slave side
    
    Updated test result for show create view in 5.0 to 5.1

diff -Nrup a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
--- a/mysql-test/suite/rpl/r/rpl_sp.result	2008-05-08 13:43:56 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_sp.result	2008-05-08 14:02:08 +02:00
@@ -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
diff -Nrup a/mysql-test/suite/rpl/r/rpl_view.result
b/mysql-test/suite/rpl/r/rpl_view.result
--- a/mysql-test/suite/rpl/r/rpl_view.result	2008-05-08 13:45:39 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_view.result	2008-05-08 14:02:08 +02:00
@@ -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