← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_thr_init.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_thr_init.cc
18
18
  thread variables.
19
19
*/
20
20
 
21
 
#include "drizzled/internal/mysys_priv.h"
 
21
#include "config.h"
 
22
 
 
23
#include "drizzled/internal/my_sys.h"
22
24
#include "drizzled/internal/my_pthread.h"
23
25
#include "drizzled/internal/m_string.h"
24
26
 
25
 
#include <stdio.h>
 
27
#include <cstdio>
26
28
#include <signal.h>
27
29
 
28
30
#if TIME_WITH_SYS_TIME
36
38
# endif
37
39
#endif
38
40
 
 
41
namespace drizzled
 
42
{
 
43
namespace internal
 
44
{
 
45
 
39
46
uint32_t thd_lib_detected= 0;
40
47
 
41
48
pthread_key_t THR_KEY_mysys;
256
263
#endif
257
264
  return THD_LIB_OTHER;
258
265
}
 
266
 
 
267
} /* namespace internal */
 
268
} /* namespace drizzled */