diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2005-01-21 17:51:24 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2005-01-21 17:51:24 +0400 |
| commit | 56b1a854698e98412746164e764bf29bb435e55d (patch) | |
| tree | d45a8dc56c3f51c937a3fc7a6517aff5e3cdb1ed /sql | |
| parent | aea5775c566b6417bd49eb9c33b0fa16f7272180 (diff) | |
| download | mariadb-git-56b1a854698e98412746164e764bf29bb435e55d.tar.gz | |
A fix (Bug #8015: server refuses to start with long basedir path).
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4b785aafc5f..85a54c69467 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -852,7 +852,7 @@ extern Gt_creator gt_creator; extern Lt_creator lt_creator; extern Ge_creator ge_creator; extern Le_creator le_creator; -extern char language[LIBLEN],reg_ext[FN_EXTLEN]; +extern char language[FN_REFLEN], reg_ext[FN_EXTLEN]; extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN]; extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file; extern char log_error_file[FN_REFLEN]; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d1fef3519bf..4c30ad51751 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -340,7 +340,7 @@ char *default_tz_name; char log_error_file[FN_REFLEN], glob_hostname[FN_REFLEN]; char* log_error_file_ptr= log_error_file; char mysql_real_data_home[FN_REFLEN], - language[LIBLEN],reg_ext[FN_EXTLEN], mysql_charsets_dir[FN_REFLEN], + language[FN_REFLEN], reg_ext[FN_EXTLEN], mysql_charsets_dir[FN_REFLEN], *mysqld_user,*mysqld_chroot, *opt_init_file, *opt_init_connect, *opt_init_slave, def_ft_boolean_syntax[sizeof(ft_boolean_syntax)]; |