diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-11-30 22:38:12 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-11-30 22:38:12 +0200 |
| commit | b2c471ce2c19a6b553fb3499843c623ab7263ca5 (patch) | |
| tree | ed9e2b22ed77e3ea701164ea1905e9d4c8da0cf5 /server-tools | |
| parent | 346557a957576006bd1745ece1cd3c1b801f0058 (diff) | |
| parent | ece6b7e1b94078e7f202f26251f0024e1d458c45 (diff) | |
| download | mariadb-git-b2c471ce2c19a6b553fb3499843c623ab7263ca5.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
client/mysql.cc:
Auto merged
cmd-line-utils/readline/bind.c:
Auto merged
cmd-line-utils/readline/histfile.c:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
include/my_global.h:
Auto merged
include/my_tree.h:
Auto merged
mysys/my_thr_init.c:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/portability.h:
Auto merged
sql/field.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_cache.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/heap/hp_clear.c:
Auto merged
storage/heap/hp_write.c:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
strings/ctype-simple.c:
Auto merged
client/mysqldump.c:
Manual merge
client/mysqltest.c:
Manual merge
extra/replace.c:
Manual merge
libmysql/libmysql.c:
Manual merge
mysys/base64.c:
Manual merge
sql/ha_ndbcluster.cc:
Manual merge
sql/handler.cc:
Manual merge
sql/item_strfunc.cc:
Manual merge
sql/item_timefunc.cc:
Manual merge
sql/log.cc:
Manual merge
sql/opt_range.cc:
Manual merge
sql/password.c:
Manual merge
sql/sp.cc:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_cache.cc:
Manual merge
sql/sql_db.cc:
Manual merge
sql/sql_rename.cc:
Manual merge
sql/sql_select.cc:
Manual merge
sql/sql_show.cc:
Manual merge
sql/sql_trigger.cc:
Manual merge
sql/sql_update.cc:
Manual merge
sql/tztime.cc:
Manual merge
storage/archive/ha_archive.cc:
Manual merge
storage/federated/ha_federated.cc:
Manual merge
storage/myisam/mi_create.c:
Manual merge
storage/myisam/myisampack.c:
Manual merge
storage/myisammrg/myrg_rkey.c:
Manual merge
storage/ndb/src/mgmapi/mgmapi.cpp:
Manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Manual merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Manual merge
storage/ndb/src/ndbapi/Ndblist.cpp:
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 |