diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-11 16:10:51 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-11 16:10:51 +0300 |
| commit | 7973ab7c360d949f64ab4439d8eb504fd07b3f33 (patch) | |
| tree | 96e462dddffdd80b64ccdfa08dc6e63ef23e7956 /sql/event_data_objects.cc | |
| parent | 42c5cff706466cd2da1e46f2f79177e1578538ba (diff) | |
| parent | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (diff) | |
| download | mariadb-git-7973ab7c360d949f64ab4439d8eb504fd07b3f33.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 7562e8d8207..7f4104f4a77 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2006 MySQL AB +/* Copyright (C) 2004-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1403,8 +1403,7 @@ Event_job_data::execute(THD *thd, bool drop) } #endif - if (check_access(thd, EVENT_ACL, dbname.str, - 0, 0, 0, is_schema_db(dbname.str))) + if (check_access(thd, EVENT_ACL, dbname.str, NULL, NULL, 0, 0)) { /* This aspect of behavior is defined in the worklog, |