diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-10-26 11:44:30 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-10-26 11:44:30 +0200 |
| commit | ca126a9990a51b9a7e07842d83ee8b08415cd326 (patch) | |
| tree | b97a62bbfe7e9dec22b56a614aae010e79734c5d /sql/sql_base.cc | |
| parent | 6a8e10d2ce64e506a5c58ef3b58178105f4b5973 (diff) | |
| parent | 0e700e1eeb4debd107c36cd5d386592287a4a67a (diff) | |
| download | mariadb-git-ca126a9990a51b9a7e07842d83ee8b08415cd326.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31662/50-31662
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index b97ba45e18f..b206e4a6e03 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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, 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, |