From 3648b333c74b5c36776db30a4370bafa28a73ef0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 9 Jun 2021 18:31:23 +0200 Subject: cleanup: formatting also avoid an oxymoron of using `MYSQL_PLUGIN_IMPORT` under `#ifdef MYSQL_SERVER`, and empty_clex_str is so trivial that a plugin can define it if needed. --- sql/sql_string.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sql/sql_string.cc') diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 053591d8c4e..ff81a5f5ca4 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -848,10 +848,9 @@ bool Binary_string::copy_printable_hhhh(CHARSET_INFO *to_cs, */ -int sortcmp(const String *s,const String *t, CHARSET_INFO *cs) +int sortcmp(const Binary_string *s, const Binary_string *t, CHARSET_INFO *cs) { - return cs->strnncollsp(s->ptr(), s->length(), - t->ptr(), t->length()); + return cs->strnncollsp(s->ptr(), s->length(), t->ptr(), t->length()); } @@ -873,7 +872,7 @@ int sortcmp(const String *s,const String *t, CHARSET_INFO *cs) */ -int stringcmp(const String *s,const String *t) +int stringcmp(const Binary_string *s, const Binary_string *t) { uint32 s_len=s->length(),t_len=t->length(),len=MY_MIN(s_len,t_len); int cmp= len ? memcmp(s->ptr(), t->ptr(), len) : 0; -- cgit v1.2.1