diff options
| author | Sven Sandberg <sven.sandberg@sun.com> | 2009-09-30 18:00:22 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@sun.com> | 2009-09-30 18:00:22 +0200 |
| commit | 3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c (patch) | |
| tree | 9294c1869671b21c13da2117df804e3a5b9a56a4 /sql/events.cc | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| parent | bfb1de9c065b6e9fd6b9fecb1c2db2b4475d3135 (diff) | |
| download | mariadb-git-3d467f04a1caa994f165c0c4aae2ecfc3d1c9a1c.tar.gz | |
merged fixes for BUG#39934 to 5.1-rpl+3
Also renamed current_stmt_binlog_row_based to
current_stmt_binlog_format_row for consistency
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 34da0e185b7..5b9acb589b7 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -430,8 +430,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(); pthread_mutex_lock(&LOCK_event_metadata); @@ -563,8 +563,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(); pthread_mutex_lock(&LOCK_event_metadata); @@ -660,8 +660,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(); pthread_mutex_lock(&LOCK_event_metadata); /* On error conditions my_error() is called so no need to handle here */ |