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 | e7b332ba83f7ecd5dbc518df5d5f4c84fc542552 (patch) | |
| tree | a1d34e4650281143b62067088c8965f2cceacb2d /sql/sql_load.cc | |
| parent | 00dc9a6e70512905ef441274b0574fd2503f15b1 (diff) | |
| parent | 08bcd2d8f67dcacd36abd2592fa2a59321abe7c2 (diff) | |
| download | mariadb-git-e7b332ba83f7ecd5dbc518df5d5f4c84fc542552.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 39f4c1d279a..e86aa42f67c 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -582,8 +582,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, version for the binary log to mark that table maps are invalid after this point. */ - if (thd->current_stmt_binlog_row_based) - error= thd->binlog_flush_pending_rows_event(true); + if (thd->is_current_stmt_binlog_format_row()) + error= thd->binlog_flush_pending_rows_event(TRUE, transactional_table); else { /* @@ -731,7 +731,7 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, (uint) ((char*) fname_end - (char*) thd->query()), (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), - transactional_table, FALSE, errcode); + transactional_table, FALSE, FALSE, errcode); e.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F; return mysql_bin_log.write(&e); } |