bk commit into 5.1 tree (gshchepa:1.2577) BUG#35193

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.1 repository of gshchepa.  When gshchepa 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-03-27 00:55:13+04:00, gshchepa@stripped +1 -0
  view.result:
    Post-merge fix (bug #35193).

  mysql-test/r/view.result@stripped, 2008-03-27 00:54:25+04:00, gshchepa@stripped +2 -2
    Post-merge fix (bug #35193).

diff -Nrup a/mysql-test/r/view.result b/mysql-test/r/view.result
--- a/mysql-test/r/view.result	2008-03-27 00:51:28 +04:00
+++ b/mysql-test/r/view.result	2008-03-27 00:54:25 +04:00
@@ -3665,8 +3665,8 @@ SELECT * FROM v1;
 1
 1
 SHOW CREATE TABLE v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1`
AS select 1 AS `1` from DUAL  where 1
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1`
AS select 1 AS `1` from DUAL  where 1	latin1	latin1_swedish_ci
 
 DROP VIEW v1;