summaryrefslogtreecommitdiff
path: root/mysys/my_gethostbyname.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
commita7798dfd0a6472bf65fffc2ade543605e177ff9c (patch)
tree675836bfd2d520dcffdb4499ac8cf51045c407f2 /mysys/my_gethostbyname.c
parent7cb2e2d1dce2c7466388f4a6ade0614564be82fc (diff)
downloadmariadb-git-a7798dfd0a6472bf65fffc2ade543605e177ff9c.tar.gz
Enable LOAD DATA LOCAL INFILE in mysql_test
Added syntax for column comments (for compability with 4.1) Fix of ALTER TABLE RENAME Docs/manual.texi: Changelog client/mysqltest.c: Enable LOAD DATA LOCAL INFILE mysql-test/r/alter_table.result: Test of syntax for column comments mysql-test/r/func_math.result: Fixed test of new truncate mysql-test/t/alter_table.test: Test of syntax for column comments mysys/my_gethostbyname.c: Portability fix sql/hostname.cc: Fixed pointer bug sql/item_cmpfunc.cc: Optimizing LIKE code sql/item_cmpfunc.h: Cleanup sql/mysqld.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_analyse.cc: Removed warning from DBUG sql/sql_parse.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_table.cc: Fix of ALTER TABLE RENAME sql/sql_yacc.yy: Added syntax for field comments vio/test-sslserver.c: Cleanup
Diffstat (limited to 'mysys/my_gethostbyname.c')
-rw-r--r--mysys/my_gethostbyname.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c
index 898ca694121..1380257f660 100644
--- a/mysys/my_gethostbyname.c
+++ b/mysys/my_gethostbyname.c
@@ -18,7 +18,9 @@
/* Thread safe version of gethostbyname_r() */
#include "mysys_priv.h"
+#ifdef THREAD
#include "my_pthread.h"
+#endif
#include <assert.h>
#if !defined(MSDOS) && !defined(__WIN__)
#include <netdb.h>
@@ -28,11 +30,6 @@
/* This file is not needed if my_gethostbyname_r is a macro */
#if !defined(my_gethostbyname_r)
-#ifndef THREAD
-#define pthread_mutex_lock(A)
-#define pthread_mutex_unlock(A)
-#endif
-
/*
Emulate SOLARIS style calls, not because it's better, but just to make the
usage of getbostbyname_r simpler.