1 files changed, 3 insertions, 5 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 2886cb68f9b..78989e9f517 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -542,10 +542,7 @@ class Item_func_sysconst :public Item_str_func
 public:
   Item_func_sysconst()
   { collation.set(system_charset_info,DERIVATION_SYSCONST); }
-  Item *safe_charset_converter(CHARSET_INFO *tocs)
-  {
-    return const_charset_converter(tocs, true, fully_qualified_func_name());
-  }
+  Item *safe_charset_converter(CHARSET_INFO *tocs);
   /*
     Used to create correct Item name in new converted item in
     safe_charset_converter, return string representation of this function
@@ -557,6 +554,7 @@ public:
     return trace_unsupported_by_check_vcol_func_processor(
                                            fully_qualified_func_name());
   }
+  bool const_item() const;
 };
 
 
@@ -635,7 +633,7 @@ public:
   String *val_str(String *)
   {
     DBUG_ASSERT(fixed == 1);
-    return (null_value ? 0 : &str_value);
+    return null_value ? NULL : &str_value;
   }
 };