diff options
| author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-04-16 16:56:16 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-04-16 16:56:16 +0200 |
| commit | f394543181fbc2e7b255695ce47f2c7cbae085b5 (patch) | |
| tree | a5a9487d84649365849fe58bb5b16cf46e586b70 /sql/sql_load.cc | |
| parent | 2a37d531be7c29eb93ade6c7a9c33fd3b9b9f1de (diff) | |
| parent | 6156581e07bf02592c0c4ac54411530a35912d05 (diff) | |
| download | mariadb-git-f394543181fbc2e7b255695ce47f2c7cbae085b5.tar.gz | |
Automerge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 869a52325ea..71cf118f577 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -687,12 +687,10 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, strcpy(end, p); end += pl; - thd->set_query_inner(load_data_query, end - load_data_query); - Execute_load_query_log_event - e(thd, thd->query(), thd->query_length(), - (uint) ((char*) fname_start - (char*) thd->query() - 1), - (uint) ((char*) fname_end - (char*) thd->query()), + e(thd, load_data_query, end-load_data_query, + (uint) ((char*) fname_start - load_data_query - 1), + (uint) ((char*) fname_end - load_data_query), (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), transactional_table, FALSE, errcode); |