diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/events.cc | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc index f36e72d2f18..a548bda53e2 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -13,8 +13,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" +#include "sql_parse.h" // check_access +#include "sql_base.h" // close_thread_tables +#include "sql_show.h" // append_definer #include "events.h" +#include "sql_db.h" // check_db_dir_existence +#include "sql_table.h" // write_bin_log +#include "tztime.h" // struct Time_zone +#include "sql_acl.h" // EVENT_ACL +#include "records.h" // init_read_record, end_read_record #include "event_data_objects.h" #include "event_db_repository.h" #include "event_queue.h" |