Made lock_io_cache() and unlock_io_cache() as functions.

VC++Files/mysql.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/mysql.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysql.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqladmin.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlclient.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlclient.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqldump.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlimport.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/client/mysqlshow.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/dbug/dbug.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/dbug/dbug.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/heap/heap.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/innobase/innobase.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/isam/isam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/isam/isam.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/isamchk/isamchk.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysql/libmySQL.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysql/libmysql.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/libmysqltest/myTest.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/libmysqltest/mytest.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/merge/merge.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/merge/merge.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/myisam/myisam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisamchk/myisamchk.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisamlog/myisamlog.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisammrg/myisammrg.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/myisampack/myisampack.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlmanager/MySqlManager.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlmanager/mysqlmanager.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlshutdown/myshutdown.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysys/mysys.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/mysys/mysys.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/pack_isam/pack_isam.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/perror/perror.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/regex/regex.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/regex/regex.dsw:
  Turn on EOLN_NATIVE flag
VC++Files/replace/replace.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/sql/mysqld.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/sql/mysqldmax.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/strings/noMASM/strings.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/strings/strings.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/test1/test1.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/thr_test/thr_test.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/vio/vio.dsp:
  Turn on EOLN_NATIVE flag
VC++Files/zlib/zlib.dsp:
  Turn on EOLN_NATIVE flag

1 files changed, 5 insertions, 26 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 4ddd204c406..9e64d3159c5 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -322,29 +322,6 @@ typedef struct st_io_cache_share
   my_bool alloced;
 #endif
 } IO_CACHE_SHARE;
-
-#define lock_io_cache(info)                                              \
-  (                                                                      \
-    (errno=pthread_mutex_lock(&((info)->share->mutex))) ? -1 : (         \
-      (info)->share->count ? (                                           \
-        --((info)->share->count),                                        \
-        pthread_cond_wait(&((info)->share->cond),                        \
-                          &((info)->share->mutex)),                      \
-        (++((info)->share->count) ?                                      \
-          pthread_mutex_unlock(&((info)->share->mutex)) : 0))            \
-        : 1 )                                                            \
-  )
-
-#define unlock_io_cache(info)                                            \
-  (                                                                      \
-    pthread_cond_broadcast(&((info)->share->cond)),                      \
-    pthread_mutex_unlock  (&((info)->share->mutex))                      \
-  )
-/* -- to catch errors
-#else
-#define lock_io_cache(info)
-#define unlock_io_cache(info)
-*/
 #endif
 
 typedef struct st_io_cache		/* Used when cacheing files */
@@ -686,9 +663,11 @@ extern my_bool reinit_io_cache(IO_CACHE *info,enum cache_type type,
 extern int _my_b_read(IO_CACHE *info,byte *Buffer,uint Count);
 #ifdef THREAD
 extern int _my_b_read_r(IO_CACHE *info,byte *Buffer,uint Count);
-extern int init_io_cache_share(IO_CACHE *info,
-                             IO_CACHE_SHARE *s, uint num_threads);
-extern int remove_io_thread(IO_CACHE *info);
+extern void init_io_cache_share(IO_CACHE *info,
+				IO_CACHE_SHARE *s, uint num_threads);
+extern void remove_io_thread(IO_CACHE *info);
+int lock_io_cache(IO_CACHE *);
+void unlock_io_cache(IO_CACHE *);
 #endif
 extern int _my_b_seq_read(IO_CACHE *info,byte *Buffer,uint Count);
 extern int _my_b_net_read(IO_CACHE *info,byte *Buffer,uint Count);