Merge mysql.com:/scratch/tnurnberg/31662/50-31662

into  mysql.com:/scratch/tnurnberg/31662/51-31662


mysql-test/r/information_schema_db.result:
  Auto merged
sql/sql_base.cc:
  Auto merged

mysql-test/r/information_schema_db.result

@@ -141,7 +141,7 @@ Warnings:
 Warning	1356	View 'testdb_1.v7' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 show fields from testdb_1.v7;
 Field	Type	Null	Key	Default	Extra
-f1	null	YES		NULL	
+f1	char(4)	YES		NULL	
 Warnings:
 Note	1449	There is no 'no_such_user'@'no_such_host' registered
 create table t3 (f1 char(4), f2 char(4));
@@ -161,7 +161,7 @@ View	Create View	character_set_client	collation_connection
 v6	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `testdb_1`.`v6` AS select `testdb_1`.`t1`.`f1` AS `f1` from `testdb_1`.`t1`	latin1	latin1_swedish_ci
 show fields from testdb_1.v7;
 Field	Type	Null	Key	Default	Extra
-f1	null	YES		NULL	
+f1	char(4)	YES		NULL	
 Warnings:
 Note	1449	There is no 'no_such_user'@'no_such_host' registered
 show create view testdb_1.v7;
@@ -189,7 +189,7 @@ show create view v4;
 ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
 show fields from v4;
 Field	Type	Null	Key	Default	Extra
-f1	null	YES		NULL	
+f1	char(4)	YES		NULL	
 f2	char(4)	YES		NULL	
 show fields from v2;
 Field	Type	Null	Key	Default	Extra

sql/sql_base.cc

@@ -5112,7 +5112,9 @@ find_field_in_tables(THD *thd, Item_ident *item,
   {
     Field *cur_field= find_field_in_table_ref(thd, cur_table, name, length,
                                               item->name, db, table_name, ref,
-                                              check_privileges,
+                                              (thd->lex->sql_command ==
+                                               SQLCOM_SHOW_FIELDS)
+                                              ? false : check_privileges,
                                               allow_rowid,
                                               &(item->cached_field_index),
                                               register_tree_change,