diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-05-07 13:37:16 +0400 |
| commit | 762b535de2104cd08b10a1a41f16f9df1371b95d (patch) | |
| tree | 385aedcde4e00b31a7b5e1b308d16b5460be7b94 /sql/sql_load.cc | |
| parent | 21b8741b57204f784633c6337f9abacaa59ff3e2 (diff) | |
| parent | 7af6ac8f3ed64333f3dcb87c15e93bcfafd66bf1 (diff) | |
| download | mariadb-git-762b535de2104cd08b10a1a41f16f9df1371b95d.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/engines/funcs/t/disabled.def
- mysql-test/suite/engines/iuds/t/disabled.def
- mysql-test/suite/engines/iuds/t/insert_number.test
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 89bb8a9634c..36d7a413ad3 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -696,7 +696,7 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex, { if (n++) pfields.append(", "); - if (item->name) + if (item->type() == Item::FIELD_ITEM) { pfields.append("`"); pfields.append(item->name); |