database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: formatting

Browse Source 
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.
This commit is contained in:
Sergei Golubchik
2021-06-09 18:31:23 +02:00
parent 89342a3bd5
commit 3648b333c7
13 changed files with 65 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_string.cc
View File

@ -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;