diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
| commit | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (patch) | |
| tree | b51a6b87f0d2488845144be585275c8cac19a1ed /sql/sql_table.h | |
| parent | 6378c95ee07cccc2f2187b2caddc4496e14827d9 (diff) | |
| parent | fba7fbbc5c7bb1d05488108a29b854ee8ef0066a (diff) | |
| download | mariadb-git-10.3-MDEV-10953.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953
Diffstat (limited to 'sql/sql_table.h')
| -rw-r--r-- | sql/sql_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.h b/sql/sql_table.h index 4fb6135e9cc..2e080462deb 100644 --- a/sql/sql_table.h +++ b/sql/sql_table.h @@ -253,7 +253,7 @@ bool quick_rm_table(THD *thd, handlerton *base, const char *db, const char *table_path=0); void close_cached_table(THD *thd, TABLE *table); void sp_prepare_create_field(THD *thd, Column_definition *sql_field); -CHARSET_INFO* get_sql_field_charset(Create_field *sql_field, +CHARSET_INFO* get_sql_field_charset(Column_definition *sql_field, HA_CREATE_INFO *create_info); bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags); int write_bin_log(THD *thd, bool clear_error, |