diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-21 22:36:05 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-21 22:36:05 +0300 |
| commit | eb79ef1535f092a2e3fee9cf514ff0c581de0bd2 (patch) | |
| tree | 551412956bc864d32aedd08989fa82ca72339d00 /sql/mysql_priv.h | |
| parent | b5706ded0e519a3f0ad2ace630178e13faad5ca5 (diff) | |
| parent | d1ad316a59b6bd48dec94433ffe982ddfc376e35 (diff) | |
| download | mariadb-git-eb79ef1535f092a2e3fee9cf514ff0c581de0bd2.tar.gz | |
Auto-merge from mysql-next-mr.
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 937f92b37f3..818475e85d8 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 */ |