diff options
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e68bcb9e281..4da71593b83 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -329,6 +329,7 @@ void THD::init(void) bzero((char*) warn_count, sizeof(warn_count)); total_warn_count= 0; update_charset(); + reset_current_stmt_binlog_row_based(); bzero((char *) &status_var, sizeof(status_var)); } @@ -2026,12 +2027,12 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, INSERT INTO t1 VALUES (1), (foo()), (2); */ - if (binlog_row_based) + if (current_stmt_binlog_row_based) binlog_flush_pending_rows_event(false); #endif /* HAVE_ROW_BASED_REPLICATION */ if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) && - !binlog_row_based) + !current_stmt_binlog_row_based) options&= ~OPTION_BIN_LOG; /* Disable result sets */ client_capabilities &= ~CLIENT_MULTI_RESULTS; @@ -2394,7 +2395,7 @@ int THD::binlog_write_row(TABLE* table, bool is_trans, MY_BITMAP const* cols, my_size_t colcnt, byte const *record) { - DBUG_ASSERT(binlog_row_based && mysql_bin_log.is_open()); + DBUG_ASSERT(current_stmt_binlog_row_based && mysql_bin_log.is_open()); /* Pack records into format for transfer. We are allocating more @@ -2441,7 +2442,7 @@ int THD::binlog_update_row(TABLE* table, bool is_trans, const byte *before_record, const byte *after_record) { - DBUG_ASSERT(binlog_row_based && mysql_bin_log.is_open()); + DBUG_ASSERT(current_stmt_binlog_row_based && mysql_bin_log.is_open()); bool error= 0; my_size_t const before_maxlen = max_row_length(table, before_record); @@ -2489,7 +2490,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans, MY_BITMAP const* cols, my_size_t colcnt, byte const *record) { - DBUG_ASSERT(binlog_row_based && mysql_bin_log.is_open()); + DBUG_ASSERT(current_stmt_binlog_row_based && mysql_bin_log.is_open()); /* Pack records into format for transfer. We are allocating more @@ -2520,7 +2521,7 @@ int THD::binlog_delete_row(TABLE* table, bool is_trans, int THD::binlog_flush_pending_rows_event(bool stmt_end) { DBUG_ENTER("THD::binlog_flush_pending_rows_event"); - if (!binlog_row_based || !mysql_bin_log.is_open()) + if (!current_stmt_binlog_row_based || !mysql_bin_log.is_open()) DBUG_RETURN(0); /* @@ -2561,8 +2562,8 @@ void THD::binlog_delete_pending_rows_event() /* Member function that will log query, either row-based or - statement-based depending on the value of the 'binlog_row_based' - variable and the value of the 'qtype' flag. + statement-based depending on the value of the 'current_stmt_binlog_row_based' + the value of the 'qtype' flag. This function should be called after the all calls to ha_*_row() functions have been issued, but before tables are unlocked and @@ -2586,11 +2587,11 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype, moving back and forth between using RBR for replication of system tables and not using it. - Make sure to change in check_table_binlog_row_based() according + Make sure to change in check_table_current_stmt_binlog_row_based according to how you treat this. */ case THD::ROW_QUERY_TYPE: - if (binlog_row_based) + if (current_stmt_binlog_row_based) DBUG_RETURN(binlog_flush_pending_rows_event(true)); /* Otherwise, we fall through */ case THD::STMT_QUERY_TYPE: |