mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 07:35:32 +02:00
Fixes for OS2.
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
This commit is contained in:
parent
d61418b94f
commit
31b9e6e03f
137 changed files with 9927 additions and 852 deletions
|
|
@ -236,7 +236,7 @@ int my_strnncoll_big5(const uchar * s1, int len1, const uchar * s2, int len2)
|
|||
return (int) (len1-len2);
|
||||
}
|
||||
|
||||
int my_strnxfrm_big5(uchar * dest, uchar * src, int len, int srclen)
|
||||
int my_strnxfrm_big5(uchar * dest, const uchar * src, int len, int srclen)
|
||||
{
|
||||
uint16 e;
|
||||
/*uchar *d = dest; XXX: unused*/
|
||||
|
|
@ -276,7 +276,7 @@ int my_strcoll_big5(const uchar * s1, const uchar * s2)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int my_strxfrm_big5(uchar * dest, uchar * src, int len)
|
||||
int my_strxfrm_big5(uchar * dest, const uchar * src, int len)
|
||||
{
|
||||
uint16 e;
|
||||
uchar *d = dest;
|
||||
|
|
|
|||
|
|
@ -2610,7 +2610,7 @@ int my_strcoll_gbk(const uchar * s1, const uchar * s2)
|
|||
s2, (uint) strlen((char*) s2));
|
||||
}
|
||||
|
||||
int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen)
|
||||
int my_strnxfrm_gbk(uchar * dest, const uchar * src, int len, int srclen)
|
||||
{
|
||||
uint16 e;
|
||||
|
||||
|
|
@ -2630,7 +2630,7 @@ int my_strnxfrm_gbk(uchar * dest, uchar * src, int len, int srclen)
|
|||
return srclen;
|
||||
}
|
||||
|
||||
int my_strxfrm_gbk(uchar * dest, uchar * src, int len)
|
||||
int my_strxfrm_gbk(uchar * dest, const uchar * src, int len)
|
||||
{
|
||||
return my_strnxfrm_gbk(dest,src,len,(uint) strlen((char*) src));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -228,10 +228,10 @@ int my_strcoll_sjis(const uchar *s1, const uchar *s2)
|
|||
s2,(uint) strlen((char*) s2));
|
||||
}
|
||||
|
||||
int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
|
||||
int my_strnxfrm_sjis(uchar *dest, const uchar *src, int len, int srclen)
|
||||
{
|
||||
uchar *d_end = dest + len;
|
||||
uchar *s_end = src + srclen;
|
||||
uchar *s_end = (uchar*) src + srclen;
|
||||
while (dest < d_end && src < s_end) {
|
||||
if (ismbchar_sjis((char*) src, (char*) s_end)) {
|
||||
*dest++ = *src++;
|
||||
|
|
@ -244,7 +244,7 @@ int my_strnxfrm_sjis(uchar *dest, uchar *src, int len, int srclen)
|
|||
return srclen;
|
||||
}
|
||||
|
||||
int my_strxfrm_sjis(uchar *dest, uchar *src, int len)
|
||||
int my_strxfrm_sjis(uchar *dest, const uchar *src, int len)
|
||||
{
|
||||
return my_strnxfrm_sjis(dest, src, len, (uint) strlen((char*) src));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -535,7 +535,7 @@ int my_strnncoll_tis620(const uchar * s1, int len1, const uchar * s2, int len2)
|
|||
Arg: Destination buffer, source string, dest length and source length
|
||||
Ret: Conveted string size
|
||||
*/
|
||||
int my_strnxfrm_tis620(uchar * dest, uchar * src, int len, int srclen)
|
||||
int my_strnxfrm_tis620(uchar * dest, const uchar * src, int len, int srclen)
|
||||
{
|
||||
uint bufSize;
|
||||
uchar *tmp;
|
||||
|
|
@ -567,7 +567,7 @@ int my_strcoll_tis620(const uchar * s1, const uchar * s2)
|
|||
Arg: Destination buffer, String and dest buffer size
|
||||
Ret: Converting string size
|
||||
*/
|
||||
int my_strxfrm_tis620(uchar * dest, uchar * src, int len)
|
||||
int my_strxfrm_tis620(uchar * dest, const uchar * src, int len)
|
||||
{
|
||||
uint bufSize;
|
||||
uchar *tmp;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ CHARSET_INFO *find_compiled_charset_by_name(const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
uint8 compiled_charset_number(const char *name)
|
||||
uint compiled_charset_number(const char *name)
|
||||
{
|
||||
CHARSET_INFO *cs;
|
||||
for (cs = compiled_charsets; cs->number > 0; cs++)
|
||||
|
|
@ -57,7 +57,7 @@ uint8 compiled_charset_number(const char *name)
|
|||
return 0; /* this mimics find_type() */
|
||||
}
|
||||
|
||||
const char *compiled_charset_name(uint8 charset_number)
|
||||
const char *compiled_charset_name(uint charset_number)
|
||||
{
|
||||
CHARSET_INFO *cs;
|
||||
for (cs = compiled_charsets; cs->number > 0; cs++)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
uint strnlen(register const char *s, register uint maxlen)
|
||||
{
|
||||
const char *end= memchr(s, '\0', maxlen);
|
||||
const char *end= (const char *)memchr(s, '\0', maxlen);
|
||||
return end ? (uint) (end - s) : maxlen;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue