diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
| commit | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (patch) | |
| tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /sql/events.cc | |
| parent | 932285774ba4ad10c199953d47fc0f688fd12c10 (diff) | |
| parent | 8c4d4cc3a6f1fd9852e11e16926a5e98cca5ee03 (diff) | |
| download | mariadb-git-e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/events.cc b/sql/events.cc index 5379ec2c9eb..99304a1c460 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -76,7 +76,7 @@ Event_queue *Events::event_queue; Event_scheduler *Events::scheduler; Event_db_repository *Events::db_repository; -uint Events::opt_event_scheduler= Events::EVENTS_OFF; +ulong Events::opt_event_scheduler= Events::EVENTS_OFF; mysql_mutex_t Events::LOCK_event_metadata; bool Events::check_system_tables_error= FALSE; |