merge with 5.1

This commit is contained in:
Sergei Golubchik 2010-09-11 20:43:48 +02:00
commit a3d80d952d
448 changed files with 9726 additions and 3454 deletions

View file

@ -103,8 +103,8 @@ char *partition_info::create_default_partition_names(uint part_no,
{
do
{
my_sprintf(move_ptr, (move_ptr,"p%u", (start_no + i)));
move_ptr+=MAX_PART_NAME_SIZE;
sprintf(move_ptr, "p%u", (start_no + i));
move_ptr+= MAX_PART_NAME_SIZE;
} while (++i < no_parts_arg);
}
else
@ -135,7 +135,7 @@ char *partition_info::create_subpartition_name(uint subpart_no,
if (likely(ptr != NULL))
{
my_sprintf(ptr, (ptr, "%ssp%u", part_name, subpart_no));
my_snprintf(ptr, size_alloc, "%ssp%u", part_name, subpart_no);
}
else
{