diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-02 19:17:43 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-02 19:17:43 +0400 |
| commit | 5a59d706be5f38768fc861388d92c0f985a5fa1a (patch) | |
| tree | 6d057eab12491f577608f07bd6097f0b71bfa88a /sql/sql_load.cc | |
| parent | 5bfa2e8dbeb5c8c41ad33fbef392aa5cdfecac56 (diff) | |
| parent | d5325c7793a640d0f32d62088f84d3d19166add7 (diff) | |
| download | mariadb-git-5a59d706be5f38768fc861388d92c0f985a5fa1a.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/func_str.result
Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
Text conflict in mysql-test/t/func_str.test
Text conflict in sql/mysqld.cc
Text conflict in sql/protocol.cc
Text conflict in storage/myisam/mi_open.c
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 3f49543c69d..3089a7e4bfc 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -729,12 +729,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, FALSE, errcode); |