diff options
| author | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2002-10-14 12:07:16 +0300 |
| commit | 6fc7e94616ef775731423db63af7fc506fdddcae (patch) | |
| tree | 26137c7c29554f0b9d1336080b6cdc1044fb6839 /client | |
| parent | 40c2e7499b40a10ee2b8042e5d672b7c4d4c66fe (diff) | |
| parent | a299a27021a7bdd65f93f99f9eb0003f082b305d (diff) | |
| download | mariadb-git-6fc7e94616ef775731423db63af7fc506fdddcae.tar.gz | |
merge
client/mysql.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 | ||||
| -rw-r--r-- | client/sql_string.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 567b9e450e4..a73a31704b9 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1396,8 +1396,9 @@ com_go(String *buffer,char *line __attribute__((unused))) (void) com_print(buffer,0); if (skip_updates && - (buffer->length() < 4 || my_sortcmp(system_charset_info,buffer->ptr(), - "SET ",4))) + (buffer->length() < 4 || my_strnncoll(system_charset_info, + (const uchar*)buffer->ptr(),4, + (const uchar*)"SET ",4))) { (void) put_info("Ignoring query to other database",INFO_INFO); return 0; diff --git a/client/sql_string.cc b/client/sql_string.cc index cf9e9f62507..65854ece0ef 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -507,7 +507,7 @@ int sortcmp(const String *x,const String *y) uint32 x_len=x->length(),y_len=y->length(),len=min(x_len,y_len); #ifdef USE_STRCOLL - if (use_strcoll(x->str_charset)) + if (use_strnxfrm(x->str_charset)) { #ifndef CMP_ENDSPACE while (x_len && my_isspace(x->str_charset,s[x_len-1])) |