summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-07 18:56:46 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-07 18:56:46 +0400
commit480a4852a01088cdc8638934f13469b6bf54effe (patch)
treeaea0b56133cbeab4c5fde346d4d0d5e8c647c3a0 /sql/sql_load.cc
parent940ad61b712cb2f10bf5ff62330b0c9c4d8473ba (diff)
parent2a95927fa7c15cb9e5605d3830e5f30eee01d28c (diff)
downloadmariadb-git-480a4852a01088cdc8638934f13469b6bf54effe.tar.gz
Manual merge of local mysql-trunk-merge with bk-internal.
Conflicts: Text conflict in sql/CMakeLists.txt
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index d264c61c36c..77068f3d83b 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -694,7 +694,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);