diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-10-28 18:22:36 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-10-28 18:22:36 +0100 |
| commit | d9e05040f4e0f0f5053689ec1d75cd94aa2807d3 (patch) | |
| tree | 0891f6df26609fa66b89a4cc8faa8079ec21f6f3 /sql/mysql_priv.h | |
| parent | 273a0a4f97ea07620675cba1f61e84dd83c21a2f (diff) | |
| parent | b572e51c305a9360b70dd92ca9d0ecd2ab6ceeb8 (diff) | |
| download | mariadb-git-d9e05040f4e0f0f5053689ec1d75cd94aa2807d3.tar.gz | |
Merged WL#3352 into mysql-next-mr
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 05a79957963..1cf7862f6b5 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1153,6 +1153,8 @@ int prepare_create_field(Create_field *sql_field, uint *blob_columns, int *timestamps, int *timestamps_with_niladic, longlong table_flags); +CHARSET_INFO* get_sql_field_charset(Create_field *sql_field, + HA_CREATE_INFO *create_info); bool mysql_create_table(THD *thd,const char *db, const char *table_name, HA_CREATE_INFO *create_info, Alter_info *alter_info, @@ -1542,6 +1544,11 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, handlerton *old_db_type, bool *partition_changed, uint *fast_alter_partition); +char *generate_partition_syntax(partition_info *part_info, + uint *buf_length, bool use_sql_alloc, + bool show_partition_options, + HA_CREATE_INFO *create_info, + Alter_info *alter_info); #endif /* bits for last argument to remove_table_from_cache() */ |