summaryrefslogtreecommitdiff
path: root/sql/partition_info.cc
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
commite1f748c0bd7e347dbefb831d64755d834845d15b (patch)
tree8edee282fc8a225a291cd9be2e44e38709e31b1a /sql/partition_info.cc
parent80935b8659411177bc3fca4e0eb9f7747577eb1d (diff)
parented9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff)
downloadmariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r--sql/partition_info.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 5b0b681c3a6..43934551016 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -109,8 +109,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 < num_parts_arg);
}
else
@@ -177,7 +177,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
{