diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:26:58 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:26:58 +0300 |
| commit | c746716869391e29c52ea47b2d6d342299de86c3 (patch) | |
| tree | c67c1e223605f1f3e124dcbef8c7fadf1a484a06 /sql/sql_show.cc | |
| parent | 4a6457c8cb00f63077e2dadadca8a4e716eb334d (diff) | |
| parent | 679de2bb5eb36c900c0f9db189283e73ab4acbcc (diff) | |
| download | mariadb-git-c746716869391e29c52ea47b2d6d342299de86c3.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/sql_show.cc
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index bc66c8cd7ac..bb7fa61f39b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3317,11 +3317,11 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) while ((db_name= it++)) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - if (!check_access(thd, SELECT_ACL, db_name->str, - &thd->col_access, NULL, 0, 1) || + if (!(check_access(thd, SELECT_ACL, db_name->str, + &thd->col_access, NULL, 0, 1) || + (!thd->col_access && check_grant_db(thd, db_name->str))) || sctx->master_access & (DB_ACLS | SHOW_DB_ACL) || - acl_get(sctx->host, sctx->ip, sctx->priv_user, db_name->str, 0) || - !check_grant_db(thd, db_name->str)) + acl_get(sctx->host, sctx->ip, sctx->priv_user, db_name->str, 0)) #endif { thd->no_warnings_for_error= 1; |