diff options
| author | Michael Widenius <monty@mariadb.org> | 2015-10-15 12:11:17 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2015-10-21 16:31:11 +0300 |
| commit | 18f7dfed179204dcfc02a27790e22bb9cc4e2e32 (patch) | |
| tree | cf404263c6ee35c5e9c80811f5fd3845c0b98aca /sql/sql_error.cc | |
| parent | 95faf34d859aee242812fae31629b224feeb868a (diff) | |
| download | mariadb-git-18f7dfed179204dcfc02a27790e22bb9cc4e2e32.tar.gz | |
Allow mysql_upgrade to enable event after table is corrected
new features:
set event_scheduler=ON|OFF will now try to init event scheduler
if it's not enabled
set event_scheduler=default will try to enable it based on
the value of the event_scheduler when mysqld was started
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 3e18b701031..b2fa8187925 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -510,8 +510,10 @@ Diagnostics_area::set_error_status(uint sql_errno, void Diagnostics_area::disable_status() { + DBUG_ENTER("disable_status"); DBUG_ASSERT(! is_set()); m_status= DA_DISABLED; + DBUG_VOID_RETURN; } Warning_info::Warning_info(ulonglong warn_id_arg, |