diff options
| author | unknown <monty@mysql.com> | 2005-11-24 02:56:12 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-24 02:56:12 +0200 |
| commit | 81b2bbac056f21b0783f21a5830c07aba4850d85 (patch) | |
| tree | 586e1c8d17361d92a7ddb4190893e1d6527e6fc9 /include | |
| parent | fe245ed8ba1258e1f3920e449338ea92e3a3a96e (diff) | |
| parent | 97bfd41fe1382ff33a9fc458c0bd092342b217e5 (diff) | |
| download | mariadb-git-81b2bbac056f21b0783f21a5830c07aba4850d85.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant.result:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/examples/ha_tina.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/examples/ha_tina.cc:
manual merge
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 5bf604d8fad..234cc2f64dc 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -662,11 +662,7 @@ 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 */ |