mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Update VC++ files
Portability fixes After merge fixes VC++Files/mysql.dsw: Added dependencys VC++Files/mysys/mysys.dsp: Add missing files client/mysqlcheck.c: Added comment client/mysqltest.c: Remove not used variables include/keycache.h: Removed not used element include/m_ctype.h: Portability fix include/my_base.h: Removed not used define myisam/mi_keycache.c: Added mutex for extra safety mysql-test/r/count_distinct3.result: Faster test mysql-test/r/rpl_change_master.result: updated results mysql-test/t/count_distinct3.test: Faster test mysql-test/t/rpl_change_master.test: Make test repeatable mysys/default.c: Remove compiler warning mysys/mf_keycache.c: Removed not used 'action' element mysys/my_getopt.c: Remove not used variable sql/ha_myisam.cc: Remove compiler warning sql/item.cc: Fixed wrong patch from last changeset sql/item_timefunc.cc: Remove compiler warnings sql/set_var.cc: Remove compiler warnings sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: After merge fix sql/sql_select.h: Added comments sql/sql_table.cc: Remove not used define strings/ctype-tis620.c: Remove not used variables
This commit is contained in:
@ -472,13 +472,13 @@ static uchar *thai2sortable(const uchar *tstr, uint len, uint *out_length)
|
||||
const uchar *p= tstr;
|
||||
uchar *outBuf;
|
||||
uchar *pRight1, *pRight2, *pRight3;
|
||||
uchar *pLeft1, *pLeft2, *pLeft3;
|
||||
uchar *pLeft2, *pLeft3;
|
||||
uint bufSize;
|
||||
uint RightSize;
|
||||
|
||||
bufSize= (uint) (len + 1) * BUFFER_MULTIPLY;
|
||||
RightSize= sizeof(uchar) * (len + 1);
|
||||
if (!(outBuf= pLeft1= pRight1=
|
||||
if (!(outBuf= pRight1=
|
||||
(uchar *)malloc(sizeof(uchar) * bufSize + RightSize*2)))
|
||||
{
|
||||
/*
|
||||
@ -608,8 +608,8 @@ int my_strnxfrm_tis620(CHARSET_INFO *cs __attribute__((unused)),
|
||||
|
||||
int my_strcoll_tis620(const uchar * s1, const uchar * s2)
|
||||
{
|
||||
return my_strnncoll_tis620((CHARSET_INFO *) 0, s1, strlen(s1), s2,
|
||||
strlen(s1));
|
||||
return my_strnncoll_tis620((CHARSET_INFO *) 0, s1, strlen((char*) s1),
|
||||
s2, strlen((char*) s1));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user