From 4ecb38d7c976c7f069d7bf9eeff858c2fe702fd6 Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Sun, 19 Nov 2017 09:08:41 +0300
Subject: [PATCH] SQL: variadic argument type fix [#307]

---
 sql/handler.cc        | 6 +++---
 sql/item.cc           | 2 +-
 sql/partition_info.cc | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index e3a02abedee..dcbf3bccd64 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -6933,13 +6933,13 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
     if (!(share->vers_start_field()->flags & HIDDEN_FLAG))
     {
       my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
-               share->vers_start_field()->field_name);
+               share->vers_start_field()->field_name.str);
       return true;
     }
     if (!(share->vers_end_field()->flags & HIDDEN_FLAG))
     {
       my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
-               share->vers_end_field()->field_name);
+               share->vers_end_field()->field_name.str);
       return true;
     }
 
@@ -6979,7 +6979,7 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
 
         if (f->change.str && (start == f->change || end == f->change))
         {
-          my_error(ER_VERS_ALTER_SYSTEM_FIELD, MYF(0), f->change);
+          my_error(ER_VERS_ALTER_SYSTEM_FIELD, MYF(0), f->change.str);
           return true;
         }
       }
diff --git a/sql/item.cc b/sql/item.cc
index 2ed6c594e18..19b495ed50c 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -10385,7 +10385,7 @@ Item *Item_field::vers_optimized_fields_transformer(THD *thd, uchar *)
         current_thd, Sql_condition::WARN_LEVEL_WARN,
         ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY,
         ER_THD(current_thd, ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY),
-        field_name);
+        field_name.str);
 
     Item *null_item= new (thd->mem_root) Item_null(thd);
     if (null_item)
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index c414e6fd42d..439f41a12e1 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -953,7 +953,7 @@ bool partition_info::vers_setup_expression(THD * thd, uint32 alter_add)
 
   if (!table->versioned_by_sql())
   {
-    my_error(ER_VERSIONING_REQUIRED, MYF(0), table->s->table_name);
+    my_error(ER_VERSIONING_REQUIRED, MYF(0), table->s->table_name.str);
     return true;
   }