diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-03-15 12:51:23 +0100 |
| commit | f09ca00e088b316441bb76e97ba097bc9f3da7d3 (patch) | |
| tree | 1a557d74018ed9cd073b5aa960bd62421962e73d /sql/sql_show.cc | |
| parent | 2ceaffc4672c62a772890da7761d11f13d3f5ee4 (diff) | |
| parent | 71b3e46b0160936596195682a731703900fb4fff (diff) | |
| download | mariadb-git-f09ca00e088b316441bb76e97ba097bc9f3da7d3.tar.gz | |
merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 9abc40a09dc..c37676dc972 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -829,8 +829,7 @@ bool mysqld_show_create_db(THD *thd, char *dbname, DBUG_RETURN(TRUE); } #endif - if (!my_strcasecmp(system_charset_info, dbname, - INFORMATION_SCHEMA_NAME.str)) + if (is_schema_db(dbname)) { dbname= INFORMATION_SCHEMA_NAME.str; create.default_table_charset= system_charset_info; @@ -3124,8 +3123,8 @@ int make_db_list(THD *thd, List<LEX_STRING> *files, */ if (lookup_field_vals->db_value.str) { - if (!my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.str, - lookup_field_vals->db_value.str)) + if (is_schema_db(lookup_field_vals->db_value.str, + lookup_field_vals->db_value.length)) { *with_i_schema= 1; if (files->push_back(i_s_name_copy)) @@ -3712,11 +3711,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, 0, 1, with_i_schema) || + if (!(check_access(thd,SELECT_ACL, db_name->str, + &thd->col_access, 0, 1, with_i_schema) || + (!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; @@ -5579,7 +5578,7 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table) */ if (thd->lex->sql_command != SQLCOM_SHOW_EVENTS && check_access(thd, EVENT_ACL, et.dbname.str, 0, 0, 1, - is_schema_db(et.dbname.str))) + is_schema_db(et.dbname.str, et.dbname.length))) DBUG_RETURN(0); /* ->field[0] is EVENT_CATALOG and is by default NULL */ |