diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-17 21:43:35 +0000 |
| commit | 3dadf9564cbfd6e584db282b9105b8f5fb38f99b (patch) | |
| tree | fb25bfc9b6c669b42e70afadf7790f0f8d7db7e3 /sql/sql_load.cc | |
| parent | e852131f048df0c48d6779c40b23a347fbccc107 (diff) | |
| parent | e83c9f627377f05e093f092cee227da1b43d8e94 (diff) | |
| download | mariadb-git-3dadf9564cbfd6e584db282b9105b8f5fb38f99b.tar.gz | |
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
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 8109ca4313e..2f3aff43ae6 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -540,8 +540,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) - thd->binlog_flush_pending_rows_event(true); + if (thd->is_current_stmt_binlog_format_row()) + thd->binlog_flush_pending_rows_event(TRUE, transactional_table); else { /* @@ -687,7 +687,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); } |