diff options
| author | unknown <monty@mysql.com> | 2004-02-04 00:29:34 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-04 00:29:34 +0100 |
| commit | 2e17837d1414f15e25be6730334c58d74231ec3e (patch) | |
| tree | 0d7bc6937faed296cc805ae3ed4ed5cd6fa04e29 /sql/sql_show.cc | |
| parent | c11c9256ec8c315fae276254802a811befd6c05f (diff) | |
| parent | a795a783d50014f30cf791c58e6e29c217fed2e9 (diff) | |
| download | mariadb-git-2e17837d1414f15e25be6730334c58d74231ec3e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 1aca352a894..f62853ce9d6 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -491,11 +491,6 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild, { if (!wild || !wild[0] || !wild_case_compare(field->field_name,wild)) { -#ifdef NOT_USED - if (thd->col_access & TABLE_ACLS || - ! check_grant_column(thd,table,field->field_name, - (uint) strlen(field->field_name),1)) -#endif { byte *pos; uint flags=field->flags; |