diff options
| author | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
| commit | 309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch) | |
| tree | 0f73878fcf058ff862f3f7eb305aafae2ad3465d /sql/sql_repl.cc | |
| parent | a9853184d3b69a3802984e0994282dc3a3320296 (diff) | |
| parent | 530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff) | |
| download | mariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz | |
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 9f083e19146..8ba92015535 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1510,7 +1510,7 @@ err: int log_loaded_block(IO_CACHE* file) { - LOAD_FILE_INFO* lf_info; + LOAD_FILE_INFO *lf_info; uint block_len ; /* file->request_pos contains position where we started last read */ @@ -1532,7 +1532,7 @@ int log_loaded_block(IO_CACHE* file) { Create_file_log_event c(lf_info->thd,lf_info->ex,lf_info->db, lf_info->table_name, *lf_info->fields, - lf_info->handle_dup, buffer, + lf_info->handle_dup, lf_info->ignore, buffer, block_len, lf_info->log_delayed); mysql_bin_log.write(&c); lf_info->wrote_create_file = 1; |