diff options
| author | mats@mysql.com <> | 2005-07-05 16:02:03 +0200 |
|---|---|---|
| committer | mats@mysql.com <> | 2005-07-05 16:02:03 +0200 |
| commit | 0449ee1ca8030909ed9a6d319aa37851476731b2 (patch) | |
| tree | b455f1d05e9596838abc1ffd33e0ca47bc236d6e /sql | |
| parent | 4bc6bd38ec113ffa8682ee7d52c9b84d52de7534 (diff) | |
| parent | 3c427341749963ada8666eaf24a206c17ef29d56 (diff) | |
| download | mariadb-git-0449ee1ca8030909ed9a6d319aa37851476731b2.tar.gz | |
Merging 4.1 into 5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5a612791cdd..0873ee50743 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2749,7 +2749,9 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, thd->query= load_data_query; if (sql_ex.opt_flags & REPLACE_FLAG) + { handle_dup= DUP_REPLACE; + } else if (sql_ex.opt_flags & IGNORE_FLAG) { ignore= 1; |