bk commit into 5.0 tree (holyfoot:1.2044) BUG#16832

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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
  1.2044 06/02/08 17:47:11 holyfoot@deer.(none) +2 -0
  bug #16832 (Algorithm missing from "information_schema.views"

  sql/sql_show.cc
    1.308 06/02/08 17:23:49 holyfoot@stripped +6 -1
    now we send full information to the IS table

  mysql-test/r/information_schema.result
    1.98 06/02/08 17:23:49 holyfoot@stripped +8 -8
    test result fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.16832

--- 1.307/sql/sql_show.cc	Sun Jan 29 05:43:08 2006
+++ 1.308/sql/sql_show.cc	Wed Feb  8 17:23:49 2006
@@ -3038,11 +3038,16 @@
 
   if (tables->view)
   {
+    char buff[2048];
+    String qwe_str(buff, sizeof(buff), cs);
+    qwe_str.length(0);
+
     restore_record(table, s->default_values);
     table->field[1]->store(tables->view_db.str, tables->view_db.length, cs);
     table->field[2]->store(tables->view_name.str, tables->view_name.length,
                            cs);
-    table->field[3]->store(tables->query.str, tables->query.length, cs);
+    view_store_create_info(thd, tables, &qwe_str);
+    table->field[3]->store(qwe_str.ptr(), qwe_str.length(), cs);
 
     if (tables->with_check != VIEW_CHECK_NONE)
     {

--- 1.97/mysql-test/r/information_schema.result	Sun Jan 29 05:44:11 2006
+++ 1.98/mysql-test/r/information_schema.result	Wed Feb  8 17:23:49 2006
@@ -362,11 +362,11 @@
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 select * from information_schema.views where TABLE_NAME like "v%";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from
`information_schema`.`schemata`	NONE	NO	root@localhost	DEFINER
-NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from
`information_schema`.`tables` where (`tables`.`TABLE_NAME` =
_utf8'v1')	NONE	NO	root@localhost	DEFINER
-NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from
`information_schema`.`columns` where (`columns`.`TABLE_NAME` =
_utf8'v2')	NONE	NO	root@localhost	DEFINER
-NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from
`information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
-NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from
`information_schema`.`collations` where (`collations`.`COLLATION_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
+NULL	test	v0	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v0` AS select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from
`information_schema`.`schemata`	NONE	NO	root@localhost	DEFINER
+NULL	test	v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v1` AS select sql_no_cache `tables`.`TABLE_NAME` AS `c` from
`information_schema`.`tables` where (`tables`.`TABLE_NAME` =
_utf8'v1')	NONE	NO	root@localhost	DEFINER
+NULL	test	v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v2` AS select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from
`information_schema`.`columns` where (`columns`.`TABLE_NAME` =
_utf8'v2')	NONE	NO	root@localhost	DEFINER
+NULL	test	v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v3` AS select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from
`information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
+NULL	test	v4	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v4` AS select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from
`information_schema`.`collations` where (`collations`.`COLLATION_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
 drop view v0, v1, v2, v3, v4;
 create table t1 (a int);
 grant select,update,insert on t1 to mysqltest_1@localhost;
@@ -457,9 +457,9 @@
 create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;
 select * from information_schema.views;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	v1	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhost	DEFINER
-NULL	test	v2	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	LOCAL	YES	root@localhost	DEFINER
-NULL	test	v3	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhost	DEFINER
+NULL	test	v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `c` from `test`.`t1` WITH
CASCADED CHECK OPTION	CASCADED	YES	root@localhost	DEFINER
+NULL	test	v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v2` AS select sql_no_cache `test`.`t1`.`a` AS `c` from `test`.`t1` WITH
LOCAL CHECK OPTION	LOCAL	YES	root@localhost	DEFINER
+NULL	test	v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER
VIEW `test`.`v3` AS select sql_no_cache `test`.`t1`.`a` AS `c` from `test`.`t1` WITH
CASCADED CHECK OPTION	CASCADED	YES	root@localhost	DEFINER
 grant select (a) on test.t1 to joe@localhost with grant option;
 select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE