diff options
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 299597632dd..8815f60d9e2 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1056,7 +1056,7 @@ bool mysql_opt_change_db(THD *thd, bool force_switch, bool *cur_db_changed); -void mysql_parse(THD *thd, const char *inBuf, uint length, +void mysql_parse(THD *thd, char *rawbuf, uint length, const char ** semicolon); bool mysql_test_parse_for_slave(THD *thd,char *inBuf,uint length); @@ -2302,6 +2302,7 @@ char *fn_rext(char *name); /* Conversion functions */ #endif /* MYSQL_SERVER */ + #if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS uint strconvert(CHARSET_INFO *from_cs, const char *from, CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors); @@ -2326,9 +2327,6 @@ uint build_table_filename(char *buff, size_t bufflen, const char *db, const char *get_canonical_filename(handler *file, const char *path, char *tmp_path); -#define MYSQL50_TABLE_NAME_PREFIX "#mysql50#" -#define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9 - uint build_table_shadow_filename(char *buff, size_t bufflen, ALTER_PARTITION_PARAM_TYPE *lpt); /* Flags for conversion functions. */ |