mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse source 
into  mysql.com:/misc/mysql/31662/50-31662
This commit is contained in:
tnurnberg@white.intern.koehntopp.de 2007-10-26 11:44:30 +02:00
commit 3661048f99
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/information_schema_db.result
View file

@ -130,7 +130,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 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; show fields from testdb_1.v7;
Field Type Null Key Default Extra Field Type Null Key Default Extra
f1 null YES NULL f1 char(4) YES NULL
Warnings: Warnings:
Note 1449 There is no 'no_such_user'@'no_such_host' registered Note 1449 There is no 'no_such_user'@'no_such_host' registered
create table t3 (f1 char(4), f2 char(4)); create table t3 (f1 char(4), f2 char(4));
@ -150,7 +150,7 @@ View Create View
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` 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`
show fields from testdb_1.v7; show fields from testdb_1.v7;
Field Type Null Key Default Extra Field Type Null Key Default Extra
f1 null YES NULL f1 char(4) YES NULL
Warnings: Warnings:
Note 1449 There is no 'no_such_user'@'no_such_host' registered Note 1449 There is no 'no_such_user'@'no_such_host' registered
show create view testdb_1.v7; show create view testdb_1.v7;
@ -178,7 +178,7 @@ show create view v4;
ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show fields from v4; show fields from v4;
Field Type Null Key Default Extra Field Type Null Key Default Extra
f1 null YES NULL f1 char(4) YES NULL
f2 char(4) YES NULL f2 char(4) YES NULL
show fields from v2; show fields from v2;
Field Type Null Key Default Extra Field Type Null Key Default Extra

4
sql/sql_base.cc
View file

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