diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-02-28 18:14:56 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-02-28 18:14:56 -0700 |
| commit | ee950898e3aa6b188f8f8d8e490b75bab1213ec3 (patch) | |
| tree | 5d5413ca065b58fc27c6a73c2eaf337f527295be /server-tools/instance-manager/IMService.cpp | |
| parent | 5c58738ad100a24266f561c9feb25ff00e1a34e0 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-ee950898e3aa6b188f8f8d8e490b75bab1213ec3.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
include/my_pthread.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/partition_innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
server-tools/instance-manager/IMService.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/IMService.cpp')
| -rw-r--r-- | server-tools/instance-manager/IMService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/IMService.cpp b/server-tools/instance-manager/IMService.cpp index 892c4747c0d..feccaadbecc 100644 --- a/server-tools/instance-manager/IMService.cpp +++ b/server-tools/instance-manager/IMService.cpp @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <windows.h> +#include <winsock2.h> #include <signal.h> #include "IMService.h" |