diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2005-01-24 13:47:52 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2005-01-24 13:47:52 +0400 |
| commit | e33114ae2edd53d8d31740f34bae9102117fc622 (patch) | |
| tree | aeca76521369503656afea205e10fbe11aa9713b | |
| parent | 343e9bbd34ecd89deb7d28214e23171894b8b2a0 (diff) | |
| parent | fd5ea70eed911d5b1bcac1d887bb10b5937664fa (diff) | |
| download | mariadb-git-e33114ae2edd53d8d31740f34bae9102117fc622.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index ff59f7bfc55..5b363addef2 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -530,7 +530,11 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FN_LEN 256 /* Max file name len */ #define FN_HEADLEN 253 /* Max length of filepart of file name */ #define FN_EXTLEN 20 /* Max length of extension (part of FN_LEN) */ +#ifdef PATH_MAX +#define FN_REFLEN PATH_MAX/* Max length of full path-name */ +#else #define FN_REFLEN 512 /* Max length of full path-name */ +#endif #define FN_EXTCHAR '.' #define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */ #define FN_CURLIB '.' /* ./ is used as abbrev for current dir */ diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4f4aea66dd7..e71833e6af6 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 21b1cb7ffd0..a063aae78f1 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)]; |