bk commit into 5.1 tree (gshchepa:1.2587)

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.1 repository of uchum. When uchum 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, 2007-09-06 20:42:36+05:00, gshchepa@stripped +1 -0
  sp.result:
    Post-merge fix.

  mysql-test/r/sp.result@stripped, 2007-09-06 19:21:16+05:00, gshchepa@stripped +2 -2
    Post-merge fix.

diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2007-09-06 19:15:26 +05:00
+++ b/mysql-test/r/sp.result	2007-09-06 19:21:16 +05:00
@@ -6559,8 +6559,8 @@ return x;
 end|
 create view v1 as select 1 as one, f1() as days;
 show create view test.v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select 1 AS `one`,`f1`() AS `days`
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select 1 AS `one`,`f1`() AS `days`	latin1	latin1_swedish_ci
 select column_name from information_schema.columns
 where table_name='v1' and table_schema='test';
 column_name