diff options
| author | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-04-25 13:05:32 +0300 |
| commit | e726e587ec6287472dd450dbcbddf07669b3e028 (patch) | |
| tree | e644a6134bfe892512501c648c938a2e93f08130 /strings | |
| parent | 210a412522b10115d34b431c66acf403faab7bfe (diff) | |
| parent | 086185089e6c7bef58dde49b02950689af9fee63 (diff) | |
| download | mariadb-git-e726e587ec6287472dd450dbcbddf07669b3e028.tar.gz | |
Merged with mysql-5.1 tree.
client/mysqltest.cc:
Manually merged
configure.in:
Manually merged
mysql-test/r/variables.result:
Manually merged
mysql-test/t/variables.test:
Manually merged
mysys/my_pread.c:
Manually merged
mysys/my_read.c:
Manually merged
sql/mysqld.cc:
Manually merged
storage/csv/ha_tina.h:
Manually merged
storage/myisam/ha_myisam.cc:
Manually merged
storage/myisam/mi_check.c:
Manually merged
storage/myisam/mi_search.c:
Manually merged
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/Makefile.am | 3 | ||||
| -rw-r--r-- | strings/ctype.c | 4 | ||||
| -rw-r--r-- | strings/my_vsnprintf.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index b3792d308c4..ddd41e627dc 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -53,7 +53,8 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \ strinstr-sparc.s strmake-sparc.s strmov-sparc.s \ strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ - t_ctype.h my_strchr.c CMakeLists.txt + t_ctype.h my_strchr.c CMakeLists.txt \ + CHARSET_INFO.txt libmystrings_a_LIBADD= conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c diff --git a/strings/ctype.c b/strings/ctype.c index 69fe5b6b9dc..17ad1256e74 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -39,7 +39,7 @@ */ -static char *mstr(char *str,const char *src,uint l1,uint l2) +static char *mstr(char *str,const char *src,size_t l1,size_t l2) { l1= l1<l2 ? l1 : l2; memcpy(str,src,l1); @@ -143,7 +143,7 @@ typedef struct my_cs_file_info -static int fill_uchar(uchar *a,uint size,const char *str, uint len) +static int fill_uchar(uchar *a,uint size,const char *str, size_t len) { uint i= 0; const char *s, *b, *e=str+len; diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index a57cc5b5ebe..920022aae91 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -108,7 +108,7 @@ size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) char *par = va_arg(ap, char *); DBUG_ASSERT(to <= end); if (to + abs(width) + 1 > end) - width= end - to - 1; /* sign doesn't matter */ + width= (uint) (end - to - 1); /* sign doesn't matter */ memmove(to, par, abs(width)); to+= width; continue; @@ -176,7 +176,7 @@ size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) size_t my_snprintf(char* to, size_t n, const char* fmt, ...) { - int result; + size_t result; va_list args; va_start(args,fmt); result= my_vsnprintf(to, n, fmt, args); |