1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2018-10-05 08:09:49 +03:00
464 changed files with 10228 additions and 197067 deletions

View File

@ -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.