diff --git a/sql/partition_info.h b/sql/partition_info.h
index 4b37b34cecf..015e0c1d6d0 100644
--- a/sql/partition_info.h
+++ b/sql/partition_info.h
@@ -19,7 +19,7 @@
 
 #include "partition_element.h"
 
-#define MAX_STR_SIZE_PF 512
+#define MAX_STR_SIZE_PF 2048
 
 class partition_info;
 
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 8ec3d196c3b..83d50ee222e 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -2095,7 +2095,7 @@ static int add_column_list_values(File fptr, partition_info *part_info,
       err+= add_string(fptr, "NULL");
     else
     {
-      char buffer[MAX_STR_SIZE_PF];
+      char buffer[3 * MAX_STR_SIZE_PF + 10];
       String str(buffer, sizeof(buffer), &my_charset_bin);
       Item *item_expr= col_val->item_expression;
       if (item_expr->null_value)
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 57ab04b5576..46a91f7a905 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4846,7 +4846,7 @@ get_partition_column_description(partition_info *part_info,
       tmp_str.append("NULL");
     else
     {
-      char buffer[MAX_STR_SIZE_PF];
+      char buffer[3 * MAX_STR_SIZE_PF + 10];
       String str(buffer, sizeof(buffer), &my_charset_bin);
       Item *item= col_val->item_expression;