From 240445660844a4f641c91c147bde18df27733f2f Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 1 Aug 2013 17:03:15 +0400 Subject: Merging my_convert() from 10.0-serg modified: include/m_ctype.h mysys/ma_dyncol.c mysys/string.c sql/sql_string.cc sql/sql_string.h strings/ctype.c --- sql/sql_string.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sql/sql_string.h') diff --git a/sql/sql_string.h b/sql/sql_string.h index 1979ac6e4af..352dfbe9fa3 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -34,9 +34,13 @@ typedef struct st_mem_root MEM_ROOT; int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); -uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, - const char *from, uint32 from_length, - CHARSET_INFO *from_cs, uint *errors); +inline uint32 copy_and_convert(char *to, uint32 to_length, + const CHARSET_INFO *to_cs, + const char *from, uint32 from_length, + const CHARSET_INFO *from_cs, uint *errors) +{ + return my_convert(to, to_length, to_cs, from, from_length, from_cs, errors); +} uint32 well_formed_copy_nchars(CHARSET_INFO *to_cs, char *to, uint to_length, CHARSET_INFO *from_cs, -- cgit v1.2.1