~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libmysql/libmysql.c

  • Committer: Brian Aker
  • Date: 2008-07-02 21:31:48 UTC
  • mfrom: (28.1.41 libtool-patch)
  • Revision ID: brian@tangent.org-20080702213148-pc4f4hjt5c9qvp00
Merge from Monty Taylor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
#ifdef HAVE_SYS_UN_H
53
53
#include <sys/un.h>
54
54
#endif
55
 
#if defined(THREAD) && !defined(__WIN__)
56
55
#include <my_pthread.h>                         /* because of signal()  */
57
 
#endif
58
56
#ifndef INADDR_NONE
59
57
#define INADDR_NONE     -1
60
58
#endif
165
163
    (void) signal(SIGPIPE, SIG_IGN);
166
164
#endif
167
165
  }
168
 
#ifdef THREAD
169
166
  else
170
167
    result= (int)my_thread_init();         /* Init if new thread */
171
 
#endif
172
168
  return result;
173
169
}
174
170
 
226
222
 
227
223
my_bool STDCALL mysql_thread_init()
228
224
{
229
 
#ifdef THREAD
230
225
  return my_thread_init();
231
 
#else
232
 
  return 0;
233
 
#endif
234
226
}
235
227
 
236
228
void STDCALL mysql_thread_end()
237
229
{
238
 
#ifdef THREAD
239
230
  my_thread_end();
240
 
#endif
241
231
}
242
232
 
243
233
 
1133
1123
 
1134
1124
uint STDCALL mysql_thread_safe(void)
1135
1125
{
1136
 
#ifdef THREAD
1137
1126
  return 1;
1138
 
#else
1139
 
  return 0;
1140
 
#endif
1141
1127
}
1142
1128
 
1143
1129