diff options
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 611c32696ea..2e85cb105b0 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -672,7 +672,8 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, *p= NULL; size_t pl= 0; List<Item> fv; - Item *item, *val; + Item *item; + String *str; String pfield, pfields; int n; const char *tbl= table_name_arg; @@ -726,18 +727,18 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, if (!thd->lex->update_list.is_empty()) { List_iterator<Item> lu(thd->lex->update_list); - List_iterator<Item> lv(thd->lex->value_list); + List_iterator<String> ls(thd->lex->load_set_str_list); pfields.append(" SET "); n= 0; while ((item= lu++)) { - val= lv++; + str= ls++; if (n++) pfields.append(", "); append_identifier(thd, &pfields, item->name, strlen(item->name)); - pfields.append(val->name); + pfields.append((char *)str->ptr()); } } |