diff options
| author | unknown <serg@serg.mylan> | 2005-10-08 16:59:41 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-08 16:59:41 +0200 |
| commit | eb4da9fda7466de43bc6730950fbe27b442ac474 (patch) | |
| tree | d5db6d4dd011c049aeb0cfea2b3146642da2d4f0 /mysys | |
| parent | 63e7824fc2cb5fec43cafbc59d17e5cfcc2195b3 (diff) | |
| parent | 3a97babbc28178038448819a5d6f3da9ef8731c3 (diff) | |
| download | mariadb-git-eb4da9fda7466de43bc6730950fbe27b442ac474.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
server-tools/instance-manager/mysql_connection.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_os2thread.c | 2 | ||||
| -rw-r--r-- | mysys/my_winthread.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_os2thread.c b/mysys/my_os2thread.c index 0696f480a91..785ff07954d 100644 --- a/mysys/my_os2thread.c +++ b/mysys/my_os2thread.c @@ -51,7 +51,7 @@ void win_pthread_init(void) ** in the new thread. */ -static pthread_handler_decl(pthread_start,param) +pthread_handler_t pthread_start(void *param) { DBUG_ENTER("pthread_start"); pthread_handler func=((struct pthread_map *) param)->func; diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c index eebc07df180..8aaf3b1e31c 100644 --- a/mysys/my_winthread.c +++ b/mysys/my_winthread.c @@ -51,7 +51,7 @@ void win_pthread_init(void) ** in the new thread. */ -static pthread_handler_decl(pthread_start,param) +pthread_handler_t pthread_start(void *param) { pthread_handler func=((struct pthread_map *) param)->func; void *func_param=((struct pthread_map *) param)->param; |