Commit 5aab4ac2 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/home/bar/mysql-4.1
parents 996986fe b226bebc

strings/ctype-tis620.c

+2 −2
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)), 


  tc1= buf;

  if ((len1 + len2 +2) > (int) sizeof(buf))

    tc1= (uchar*) malloc(len1+len2);

    tc1= (uchar*) malloc(len1+len2+2);

  tc2= tc1 + len1+1;

  memcpy((char*) tc1, (char*) s1, len1);

  tc1[len1]= 0;		/* if length(s1)> len1, need to put 'end of string' */
@@ -568,7 +568,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)), 
  

  a= buf;

  if ((a_length + b_length +2) > (int) sizeof(buf))

    alloced= a= (uchar*) malloc(a_length+b_length);

    alloced= a= (uchar*) malloc(a_length+b_length+2);

  

  b= a + a_length+1;

  memcpy((char*) a, (char*) a0, a_length);