diff options
| author | gluh@eagle.(none) <> | 2007-12-13 15:56:04 +0400 |
|---|---|---|
| committer | gluh@eagle.(none) <> | 2007-12-13 15:56:04 +0400 |
| commit | 4f5868114a1fe46f139f80d894dd28f1f7c180c1 (patch) | |
| tree | e37ba43ba6ed4171e2b64ad9dbba79328c95a875 /sql/events.cc | |
| parent | 8506efa91e2bccbd312411a949960ec8736a363f (diff) | |
| parent | d3889cac7ca8a2188abfd2bcdbe928cee9fd893b (diff) | |
| download | mariadb-git-4f5868114a1fe46f139f80d894dd28f1f7c180c1.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/events.cc b/sql/events.cc index 73b8f2cda84..87385082a82 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -825,8 +825,8 @@ Events::fill_schema_events(THD *thd, TABLE_LIST *tables, COND * /* cond */) if (thd->lex->sql_command == SQLCOM_SHOW_EVENTS) { DBUG_ASSERT(thd->lex->select_lex.db); - if (check_access(thd, EVENT_ACL, thd->lex->select_lex.db, 0, 0, 0, - is_schema_db(thd->lex->select_lex.db))) + if (!is_schema_db(thd->lex->select_lex.db) && // There is no events in I_S + check_access(thd, EVENT_ACL, thd->lex->select_lex.db, 0, 0, 0, 0)) DBUG_RETURN(1); db= thd->lex->select_lex.db; } |