diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | 11fe627e3f0ecf45abdb49f3b92cca88b12465e7 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /sql/sql_load.cc | |
| parent | c805d9bc0b127e1126eeb7814d5ff5d66a539b47 (diff) | |
| parent | ba192d38bda55ac8b2cf3ccc5a6338e053ccddb1 (diff) | |
| download | mariadb-git-11fe627e3f0ecf45abdb49f3b92cca88b12465e7.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46
Still two test failures to be solved: main.myisam and main.subselect.
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 82cc8f81b4a..03606c11521 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -689,12 +689,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); |