diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-21 12:59:46 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-21 12:59:46 -0400 |
| commit | 167aaaa5a4d13d735a97cd0db1193841a783fca7 (patch) | |
| tree | 3086a79b8bf655d1668a25f2e43dec8f4ce7be11 /server-tools | |
| parent | a6113078116ca73dcc664706a54ca6cbe794892a (diff) | |
| parent | 5c8c2ab43b73984889fd6c337523b657861793ea (diff) | |
| download | mariadb-git-167aaaa5a4d13d735a97cd0db1193841a783fca7.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
server-tools/instance-manager/listener.cc:
Auto merged
server-tools/instance-manager/portability.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysql.cc:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/portability.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/server-tools/instance-manager/portability.h b/server-tools/instance-manager/portability.h index a76cff58893..7f5039709a9 100644 --- a/server-tools/instance-manager/portability.h +++ b/server-tools/instance-manager/portability.h @@ -1,7 +1,11 @@ #ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H #define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H -#if defined(_SCO_DS) && !defined(SHUT_RDWR) +#if (defined(_SCO_DS) || defined(UNIXWARE_7)) && !defined(SHUT_RDWR) +/* + SHUT_* functions are defined only if + "(defined(_XOPEN_SOURCE) && _XOPEN_SOURCE_EXTENDED - 0 >= 1)" +*/ #define SHUT_RDWR 2 #endif |