mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-27 18:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bb-10.2-ext into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2017-10-04 08:24:06 +03:00
commit 2c1067166d
334 changed files with 5235 additions and 3076 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strings/ctype-mb.c
View file

@ -637,7 +637,7 @@ size_t my_strnxfrm_mb_internal(CHARSET_INFO *cs, uchar *dst, uchar *de,
else
{
/* Multi-byte character */
int len= (dst + chlen <= de) ? chlen : de - dst;
size_t len= (dst + chlen <= de) ? chlen : de - dst;
memcpy(dst, src, len);
dst+= len;
src+= len;

6
strings/ctype-simple.c
View file

@ -1703,7 +1703,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)),
/* Unknown character, exit the loop */
break;
}
shift= dot ? dot - str : 0; /* Right shift */
shift= dot ? (int)(dot - str) : 0; /* Right shift */
addon= 0;
exp: /* [ E [ <sign> ] <unsigned integer> ] */
@ -2019,7 +2019,7 @@ my_strxfrm_pad_desc_and_reverse(CHARSET_INFO *cs,
my_strxfrm_desc_and_reverse(str, frmend, flags, level);
if ((flags & MY_STRXFRM_PAD_TO_MAXLEN) && frmend < strend)
{
uint fill_length= strend - frmend;
size_t fill_length= strend - frmend;
cs->cset->fill(cs, (char*) frmend, fill_length, cs->pad_char);
frmend= strend;
}
@ -2041,7 +2041,7 @@ my_strxfrm_pad_desc_and_reverse_nopad(CHARSET_INFO *cs,
my_strxfrm_desc_and_reverse(str, frmend, flags, level);
if ((flags & MY_STRXFRM_PAD_TO_MAXLEN) && frmend < strend)
{
uint fill_length= strend - frmend;
size_t fill_length= strend - frmend;
memset(frmend, 0x00, fill_length);
frmend= strend;
}

4
strings/ctype-ucs2.c
View file

@ -1051,7 +1051,7 @@ static void
my_fill_mb2(CHARSET_INFO *cs, char *s, size_t slen, int fill)
{
char buf[10], *last;
int buflen, remainder;
size_t buflen, remainder;
DBUG_ASSERT((slen % 2) == 0);
@ -1066,7 +1066,7 @@ my_fill_mb2(CHARSET_INFO *cs, char *s, size_t slen, int fill)
for (last= s + slen - buflen; s <= last; s+= buflen)
{
/* Enough space for the characer */
memcpy(s, buf, (size_t) buflen);
memcpy(s, buf, buflen);
}
/*

8
strings/dtoa.c
View file

@ -106,7 +106,7 @@ size_t my_fcvt(double x, int precision, char *to, my_bool *error)
}
src= res;
len= end - src;
len= (int)(end - src);
if (sign)
*dst++= '-';
@ -238,7 +238,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
*error= FALSE;
src= res;
len= end - res;
len= (int)(end - res);
/*
Number of digits in the exponent from the 'e' conversion.
@ -330,7 +330,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
dtoa_free(res, buf, sizeof(buf));
res= dtoa(x, 5, width - decpt, &decpt, &sign, &end, buf, sizeof(buf));
src= res;
len= end - res;
len= (int)(end - res);
}
if (len == 0)
@ -396,7 +396,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
dtoa_free(res, buf, sizeof(buf));
res= dtoa(x, 4, width, &decpt, &sign, &end, buf, sizeof(buf));
src= res;
len= end - res;
len= (int)(end - res);
if (--decpt < 0)
decpt= -decpt;
}

10
strings/json_lib.c
View file

@ -399,7 +399,7 @@ static int read_strn(json_engine_t *j)
return 1;
j->state= j->stack[j->stack_p];
j->value_len= (j->s.c_str - j->value) - 1;
j->value_len= (int)(j->s.c_str - j->value) - 1;
return 0;
}
@ -537,7 +537,7 @@ static int read_num(json_engine_t *j)
if (skip_num_constant(j) == 0)
{
j->value_type= JSON_VALUE_NUMBER;
j->value_len= j->s.c_str - j->value_begin;
j->value_len= (int)(j->s.c_str - j->value_begin);
return 0;
}
return 1;
@ -1494,7 +1494,7 @@ int json_append_ascii(CHARSET_INFO *json_cs,
return c_len;
}
return json - json_start;
return (int)(json - json_start);
}
@ -1530,7 +1530,7 @@ int json_unescape(CHARSET_INFO *json_cs,
return -1;
}
return s.error==JE_EOS ? res - res_b : -1;
return s.error==JE_EOS ? (int)(res - res_b) : -1;
}
@ -1645,7 +1645,7 @@ int json_escape(CHARSET_INFO *str_cs,
}
}
return json - json_start;
return (int)(json - json_start);
}