From 45df72a416a05a8d07647be9c83629568357f121 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 14 May 2019 14:36:46 +0100
Subject: [PATCH] Fix issue during merge

---
 dbcon/mysql/ha_calpont_impl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index e57f332c5..146e026b1 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -1095,7 +1095,7 @@ uint32_t doUpdateDelete(THD* thd)
             else
                 schemaName = string(item->db_name);
 
-            columnAssignmentPtr = new ColumnAssignment(item->name, "=", "");
+            columnAssignmentPtr = new ColumnAssignment(item->name.str, "=", "");
             Item* value = value_it++;
 
             if (value->type() ==  Item::STRING_ITEM)