diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:28:41 -0600 |
| commit | a7f78045d32692aae77fcfe4a40171631e08608e (patch) | |
| tree | 68a7e089d65a9c4434527dfc1e58ba2f98a15a88 /sql/sql_show.cc | |
| parent | fa7bf21835ef154ef3ab477ee3fa8e9f40bb4e7b (diff) | |
| parent | 42223b89f948b429f71151f61968fdb825383b69 (diff) | |
| download | mariadb-git-a7f78045d32692aae77fcfe4a40171631e08608e.tar.gz | |
merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
Auto merged
client/mysqlbinlog.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql-bench/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Docs/manual.texi:
merge
include/mysql_com.h:
merge
include/mysqld_error.h:
merge
mysql-test/install_test_db.sh:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/share/czech/errmsg.txt:
merge
sql/share/danish/errmsg.txt:
merge
sql/share/dutch/errmsg.txt:
merge
sql/share/english/errmsg.txt:
merge
sql/share/estonian/errmsg.txt:
merge
sql/share/french/errmsg.txt:
merge
sql/share/german/errmsg.txt:
merge
sql/share/greek/errmsg.txt:
merge
sql/share/hungarian/errmsg.txt:
merge
sql/share/italian/errmsg.txt:
merge
sql/share/japanese/errmsg.txt:
merge
sql/share/korean/errmsg.txt:
merge
sql/share/norwegian-ny/errmsg.txt:
merge
sql/share/norwegian/errmsg.txt:
merge
sql/share/polish/errmsg.txt:
merge
sql/share/portuguese/errmsg.txt:
merge
sql/share/romanian/errmsg.txt:
merge
sql/share/russian/errmsg.txt:
merge
sql/share/slovak/errmsg.txt:
merge
sql/share/spanish/errmsg.txt:
merge
sql/share/swedish/errmsg.txt:
merge
sql/sql_base.cc:
merge
sql/sql_table.cc:
merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 2bd6e383eac..1409897a7f2 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -217,7 +217,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, table_list.db= (char*) db; table_list.real_name=file->name; table_list.grant.privilege=col_access; - if (check_grant(thd,TABLE_ACLS,&table_list,1)) + if (check_grant(thd,TABLE_ACLS,&table_list,1,1)) continue; } if (files->push_back(thd->strdup(file->name))) |