Merge 10.6 into 10.7

1 files changed, 8 insertions, 1 deletions

diff --git a/sql/table.cc b/sql/table.cc
index d6854ebd0f8..03fa3f34525 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -4926,7 +4926,8 @@ void update_create_info_from_table(HA_CREATE_INFO *create_info, TABLE *table)
 int
 rename_file_ext(const char * from,const char * to,const char * ext)
 {
-  char from_b[FN_REFLEN],to_b[FN_REFLEN];
+  /* Reserve space for ./databasename/tablename.frm + NUL byte */
+  char from_b[2 + FN_REFLEN + 4 + 1], to_b[2 + FN_REFLEN + 4 + 1];
   (void) strxmov(from_b,from,ext,NullS);
   (void) strxmov(to_b,to,ext,NullS);
   return mysql_file_rename(key_file_frm, from_b, to_b, MYF(0));
@@ -5181,6 +5182,12 @@ bool check_column_name(const char *name)
 }
 
 
+bool check_period_name(const char *name)
+{
+  return check_column_name(name);
+}
+
+
 /**
   Checks whether a table is intact. Should be done *just* after the table has
   been opened.