diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-21 12:14:34 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-21 12:14:34 +0300 |
| commit | b78e3a5d1efff8958a2ac44efadbefacaba0f163 (patch) | |
| tree | 1a7e0403e8ed7b5ae817b8249812184027c9cd68 /sql/events.cc | |
| parent | 31740ffdfcc651f9b6ebc335110fa498b3bc13fd (diff) | |
| parent | 47ac59608056bae83a3196e2feefe7d7631218e7 (diff) | |
| download | mariadb-git-b78e3a5d1efff8958a2ac44efadbefacaba0f163.tar.gz | |
Auto-merge from mysql-next-mr.
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 8b81fa7951d..ad98e257f79 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -334,8 +334,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); @@ -465,8 +465,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); @@ -561,8 +561,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 */ |