← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_open.c

  • Committer: Monty Taylor
  • Date: 2008-07-02 14:35:48 UTC
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: monty@inaugust.com-20080702143548-onj30ry0sugr01uw
Removed all references to THREAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_open.c
84
84
  if ((uint) fd < my_file_limit && my_file_info[fd].type != UNOPEN)
85
85
  {
86
86
    my_free(my_file_info[fd].name, MYF(0));
87
 
#if defined(THREAD) && !defined(HAVE_PREAD)
 
87
#if !defined(HAVE_PREAD)
88
88
    pthread_mutex_destroy(&my_file_info[fd].mutex);
89
89
#endif
90
90
    my_file_info[fd].type = UNOPEN;
120
120
  {
121
121
    if ((uint) fd >= my_file_limit)
122
122
    {
123
 
#if defined(THREAD) && !defined(HAVE_PREAD)
 
123
#if !defined(HAVE_PREAD)
124
124
      my_errno= EMFILE;
125
125
#else
126
126
      thread_safe_increment(my_file_opened,&THR_LOCK_open);
135
135
        my_file_opened++;
136
136
        my_file_total_opened++;
137
137
        my_file_info[fd].type = type_of_file;
138
 
#if defined(THREAD) && !defined(HAVE_PREAD)
 
138
#if !defined(HAVE_PREAD)
139
139
        pthread_mutex_init(&my_file_info[fd].mutex,MY_MUTEX_INIT_FAST);
140
140
#endif
141
141
        pthread_mutex_unlock(&THR_LOCK_open);