diff options
| author | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
|---|---|---|
| committer | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
| commit | eabe082d6fdf70dc15babb9cda6c01035594ae70 (patch) | |
| tree | b52789d6b0503cf1a56ee2fea977be99a7287207 /sql/mysql_priv.h | |
| parent | df059d9ca678a6f8ad20960c241608870fdcd337 (diff) | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| download | mariadb-git-eabe082d6fdf70dc15babb9cda6c01035594ae70.tar.gz | |
Manual merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index b768db95092..0a51ae529ef 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -761,6 +761,7 @@ bool check_string_byte_length(LEX_STRING *str, const char *err_msg, bool check_string_char_length(LEX_STRING *str, const char *err_msg, uint max_char_length, CHARSET_INFO *cs, bool no_error); +bool test_if_data_home_dir(const char *dir); bool parse_sql(THD *thd, class Lex_input_stream *lip, @@ -1806,7 +1807,8 @@ extern time_t server_start_time, flush_status_time; #if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS extern uint mysql_data_home_len; extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], - mysql_real_data_home[]; + mysql_real_data_home[], mysql_unpacked_real_data_home[]; +extern CHARSET_INFO *character_set_filesystem; #endif /* MYSQL_SERVER || INNODB_COMPATIBILITY_HOOKS */ #ifdef MYSQL_SERVER extern char *opt_mysql_tmpdir, mysql_charsets_dir[], |