diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-13 23:35:52 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-03-13 23:35:52 +0200 |
| commit | 74cbd71e94432e096562ed584fd2370883bdfd63 (patch) | |
| tree | 45d9abbd3b89bec4d4880130013f666463dccb90 /sql/mysql_priv.h | |
| parent | ab013df0806c83bf36d1ae4d4503ce8ff2caad84 (diff) | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| download | mariadb-git-74cbd71e94432e096562ed584fd2370883bdfd63.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
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 bfb077e92bc..6bd0895aeb1 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, @@ -1805,7 +1806,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[], |