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

2 files changed, 4 insertions, 4 deletions

diff --git a/VC++Files/test1/mysql_thr.c b/VC++Files/test1/mysql_thr.c
index c2743cb8e4c..de1d936806e 100644
--- a/VC++Files/test1/mysql_thr.c
+++ b/VC++Files/test1/mysql_thr.c
@@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
 #define pthread_mutex_lock(A)    (EnterCriticalSection(A),0)

 #define pthread_mutex_unlock(A)  LeaveCriticalSection(A)

 #define pthread_mutex_destroy(A) DeleteCriticalSection(A)

-#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B)

+#define pthread_handler_t unsigned __cdecl *
 typedef unsigned (__cdecl *pthread_handler)(void *);

 #define pthread_self() GetCurrentThread()

 

@@ -155,7 +155,7 @@ int _my_errno(void)
 ** The test program

 *****************************************************************************/

 

-pthread_handler_decl(test_thread,arg)

+pthread_handler_t test_thread(void *arg)
 {

   MYSQL mysql;

   MYSQL_RES *res;

diff --git a/VC++Files/thr_test/thr_test.c b/VC++Files/thr_test/thr_test.c
index 3427eed8441..100fcb9c45e 100644
--- a/VC++Files/thr_test/thr_test.c
+++ b/VC++Files/thr_test/thr_test.c
@@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
 #define pthread_mutex_lock(A)    (EnterCriticalSection(A),0)
 #define pthread_mutex_unlock(A)  LeaveCriticalSection(A)
 #define pthread_mutex_destroy(A) DeleteCriticalSection(A)
-#define pthread_handler_decl(A,B) unsigned __cdecl A(void *B)
+#define pthread_handler_t unsigned __cdecl *
 typedef unsigned (__cdecl *pthread_handler)(void *);
 #define pthread_self() GetCurrentThread()
 
@@ -174,7 +174,7 @@ int _my_errno(void)
 ** The test program
 *****************************************************************************/
 
-pthread_handler_decl(test_thread,arg)
+pthread_handler_t test_thread(void *arg)
 {
   pthread_mutex_lock(&LOCK_thread_count);
   thread_count--;