diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-11-30 23:27:16 +0200 |
| commit | 9b1336fec9072cab46ab237c0f94c85808b52be4 (patch) | |
| tree | 5ce45a92708629c661c7e1815428098713fb496c /server-tools | |
| parent | f8d8b3db916d71697a6d5f00eba4f0da6f522959 (diff) | |
| parent | e0aeba21a5b58038d38c92f750c1684ccb2a72d4 (diff) | |
| download | mariadb-git-9b1336fec9072cab46ab237c0f94c85808b52be4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
sql/item_create.cc:
manual merge
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/portability.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server-tools/instance-manager/portability.h b/server-tools/instance-manager/portability.h index 7f5039709a9..ef1fc31c1ea 100644 --- a/server-tools/instance-manager/portability.h +++ b/server-tools/instance-manager/portability.h @@ -15,7 +15,6 @@ #define snprintf _snprintf #define SIGKILL 9 -#define SHUT_RDWR 0x2 /*TODO: fix this */ #define PROTOCOL_VERSION 10 |