diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-20 13:07:32 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-20 13:07:32 +0300 |
| commit | d1ad316a59b6bd48dec94433ffe982ddfc376e35 (patch) | |
| tree | c7e57caf2dddf80f1b45617e4a1bac400e4e880a /sql/mysql_priv.h | |
| parent | f027e4e00f0c4ecef89b635ae2ab1e48eb076bff (diff) | |
| download | mariadb-git-d1ad316a59b6bd48dec94433ffe982ddfc376e35.tar.gz | |
Patch for WL#3736: Extended Table, Column and Index Comments.
The task is to
(a) add a comment on indexes and
(b) increase the maximum length of column, table and the new index comments.
The patch committed on behalf of Yoshinori Matsunobu (Yoshinori.Matsunobu@Sun.COM).
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b27a7ea5078..22217f1b405 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2317,7 +2317,7 @@ ulong next_io_size(ulong pos); void append_unescaped(String *res, const char *pos, uint length); int create_frm(THD *thd, const char *name, const char *db, const char *table, uint reclength, uchar *fileinfo, - HA_CREATE_INFO *create_info, uint keys); + HA_CREATE_INFO *create_info, uint keys, KEY *key_info); void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form); int rename_file_ext(const char * from,const char * to,const char * ext); bool check_db_name(LEX_STRING *db); @@ -2327,6 +2327,7 @@ char *get_field(MEM_ROOT *mem, Field *field); bool get_field(MEM_ROOT *mem, Field *field, class String *res); int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr); char *fn_rext(char *name); +bool check_duplicate_warning(THD *thd, char *msg, ulong length); /* Conversion functions */ #endif /* MYSQL_SERVER */ |