diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
| commit | ad0f1f8021dff9b93bd963603a790b5c30a7c01a (patch) | |
| tree | a1d34e4650281143b62067088c8965f2cceacb2d /sql/events.cc | |
| parent | 06e1a73af6ca0b912153b10bb23deba8fd333974 (diff) | |
| parent | b78e3a5d1efff8958a2ac44efadbefacaba0f163 (diff) | |
| download | mariadb-git-ad0f1f8021dff9b93bd963603a790b5c30a7c01a.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/events.cc b/sql/events.cc index 93d98b8624d..2d76f00c897 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -325,8 +325,8 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, Turn off row binlogging of this statement and use statement-based so that all supporting tables are updated for CREATE EVENT command. */ - if (thd->current_stmt_binlog_row_based) - thd->clear_current_stmt_binlog_row_based(); + if (thd->is_current_stmt_binlog_format_row()) + thd->clear_current_stmt_binlog_format_row(); mysql_mutex_lock(&LOCK_event_metadata); @@ -449,8 +449,8 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, Turn off row binlogging of this statement and use statement-based so that all supporting tables are updated for UPDATE EVENT command. */ - if (thd->current_stmt_binlog_row_based) - thd->clear_current_stmt_binlog_row_based(); + if (thd->is_current_stmt_binlog_format_row()) + thd->clear_current_stmt_binlog_format_row(); mysql_mutex_lock(&LOCK_event_metadata); @@ -531,8 +531,8 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) Turn off row binlogging of this statement and use statement-based so that all supporting tables are updated for DROP EVENT command. */ - if (thd->current_stmt_binlog_row_based) - thd->clear_current_stmt_binlog_row_based(); + if (thd->is_current_stmt_binlog_format_row()) + thd->clear_current_stmt_binlog_format_row(); mysql_mutex_lock(&LOCK_event_metadata); /* On error conditions my_error() is called so no need to handle here */ |