mirror of
https://github.com/MariaDB/server.git
synced 2026-05-08 08:04:29 +02:00
merged
acinclude.m4: Auto merged include/m_ctype.h: Auto merged sql/sql_parse.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged
This commit is contained in:
commit
e9242d685b
26 changed files with 181 additions and 85 deletions
|
|
@ -529,12 +529,16 @@ static uint thai2sortable(uchar *tstr, uint len)
|
|||
static
|
||||
int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
|
||||
const uchar * s1, uint len1,
|
||||
const uchar * s2, uint len2)
|
||||
const uchar * s2, uint len2,
|
||||
my_bool s2_is_prefix)
|
||||
{
|
||||
uchar buf[80] ;
|
||||
uchar *tc1, *tc2;
|
||||
int i;
|
||||
|
||||
if (s2_is_prefix && len1 > len2)
|
||||
len1= len2;
|
||||
|
||||
tc1= buf;
|
||||
if ((len1 + len2 +2) > (int) sizeof(buf))
|
||||
tc1= (uchar*) malloc(len1+len2);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue