mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Auto-merge from mysql-next-mr.

Browse source
This commit is contained in:
Alexander Nozdrin 2010-01-11 16:10:51 +03:00
commit 724caa519d
133 changed files with 5200 additions and 2297 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/event_data_objects.cc
View file

@ -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,