diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 23:28:35 +0300 |
| commit | cd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch) | |
| tree | bf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/sql_load.cc | |
| parent | 16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff) | |
| parent | b30c1886dc52153009c2ea67878a9763448f461e (diff) | |
| download | mariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 4e9c94973b9..9c7433a5f82 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -692,13 +692,12 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, strcpy(end, p); end += pl; - thd->query_length= end - load_data_query; - thd->query= load_data_query; + 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, thd->query(), thd->query_length(), + (uint) ((char*) fname_start - (char*) thd->query() - 1), + (uint) ((char*) fname_end - (char*) thd->query()), (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE : (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR), transactional_table, FALSE, errcode); |