diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:10:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:10:37 +0300 |
| commit | ee7b8b77613c8fcc9eb134fe528de9b9586365b6 (patch) | |
| tree | be09994bcfa8f4152e04932dbfeb0f933530ccb0 /sql/events.cc | |
| parent | 34e9b3c7ca9782318f8c7b9fd6743e82d5aa2ef1 (diff) | |
| parent | b60d59b958e276b966d44cb8cfd38fe9547da586 (diff) | |
| download | mariadb-git-ee7b8b77613c8fcc9eb134fe528de9b9586365b6.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/event_data_objects.cc
- sql/events.cc
- sql/mysql_priv.h
- sql/repl_failsafe.cc
- sql/sql_parse.cc
- sql/sql_show.cc
- sql/sql_view.cc
- sql/table.cc
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc index ad98e257f79..b007d73833b 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -768,7 +768,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 (!is_infoschema_db(thd->lex->select_lex.db) && // There is no events in I_S + if (!is_infoschema_db(thd->lex->select_lex.db, // There is no events in I_S + strlen(thd->lex->select_lex.db)) && check_access(thd, EVENT_ACL, thd->lex->select_lex.db, NULL, NULL, 0, 0)) DBUG_RETURN(1); |