← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_init.c

  • Committer: Brian Aker
  • Date: 2008-07-05 17:02:05 UTC
  • Revision ID: brian@tangent.org-20080705170205-ezff9is4e7hpa3x2
Conversion of handler type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_init.c
57
57
  my_umask= 0660;                       /* Default umask for new files */
58
58
  my_umask_dir= 0700;                   /* Default umask for new directories */
59
59
  init_glob_errs();
60
 
#if defined(THREAD) && defined(SAFE_MUTEX)
 
60
#if defined(SAFE_MUTEX)
61
61
  safe_mutex_global_init();             /* Must be called early */
62
62
#endif
63
 
#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
 
63
#if defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
64
64
  fastmutex_global_init();              /* Must be called early */
65
65
#endif
66
 
#ifdef THREAD
67
66
#if defined(HAVE_PTHREAD_INIT)
68
67
  pthread_init();                       /* Must be called before DBUG_ENTER */
69
68
#endif
70
69
  if (my_thread_global_init())
71
70
    return 1;
72
71
  sigfillset(&my_signals);              /* signals blocked by mf_brkhant */
73
 
#endif /* THREAD */
74
72
  {
75
73
    DBUG_ENTER("my_init");
76
74
    DBUG_PROCESS((char*) (my_progname ? my_progname : "unknown"));
164
162
  {
165
163
    DBUG_END();                /* Must be done before my_thread_end */
166
164
  }
167
 
#ifdef THREAD
168
165
  my_thread_end();
169
166
  my_thread_global_end();
170
167
#if defined(SAFE_MUTEX)
175
172
  safe_mutex_end((infoflag & (MY_GIVE_INFO | MY_CHECK_ERROR)) ? stderr :
176
173
                 (FILE *) 0);
177
174
#endif /* defined(SAFE_MUTEX) */
178
 
#endif /* THREAD */
179
175
 
180
176
  my_init_done=0;
181
177
} /* my_end */