Merge 10.3 into 10.4

1 files changed, 12 insertions, 0 deletions

diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 67e792ca5ab..95d14d9ab0d 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -2571,6 +2571,18 @@ static int add_key_with_algorithm(String *str, partition_info *part_info)
   return err;
 }
 
+char *generate_partition_syntax_for_frm(THD *thd, partition_info *part_info,
+                                        uint *buf_length,
+                                        HA_CREATE_INFO *create_info,
+                                        Alter_info *alter_info)
+{
+  sql_mode_t old_mode= thd->variables.sql_mode;
+  thd->variables.sql_mode &= ~MODE_ANSI_QUOTES;
+  char *res= generate_partition_syntax(thd, part_info, buf_length,
+                                             true, create_info, alter_info);
+  thd->variables.sql_mode= old_mode;
+  return res;
+}
 
 /*
   Generate the partition syntax from the partition data structure.