1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Fix gcc 7.3 compiler warnings.

This commit is contained in:
Oleksandr Byelkin
2018-08-03 14:37:55 +02:00
parent 9d42eb5e28
commit 701f0b8e36
7 changed files with 27 additions and 8 deletions

View File

@ -8313,6 +8313,12 @@ int create_partition_name(char *out, size_t outlen, const char *in1,
end= strxnmov(out, outlen-1, in1, "#P#", transl_part, "#TMP#", NullS);
else if (name_variant == RENAMED_PART_NAME)
end= strxnmov(out, outlen-1, in1, "#P#", transl_part, "#REN#", NullS);
else
{
DBUG_ASSERT(0);
out[0]= 0;
end= out + (outlen-1);
}
if (end - out == static_cast<ptrdiff_t>(outlen-1))
{
my_error(ER_PATH_LENGTH, MYF(0), longest_str(in1, transl_part));
@ -8355,6 +8361,12 @@ int create_subpartition_name(char *out, size_t outlen,
else if (name_variant == RENAMED_PART_NAME)
end= strxnmov(out, outlen-1, in1, "#P#", transl_part_name,
"#SP#", transl_subpart_name, "#REN#", NullS);
else
{
DBUG_ASSERT(0);
out[0]= 0;
end= out + (outlen-1);
}
if (end - out == static_cast<ptrdiff_t>(outlen-1))
{
my_error(ER_PATH_LENGTH, MYF(0),