Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/home/my/mysql-5.0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_manager.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

5 files changed, 83 insertions, 108 deletions

diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index 0fec9d27b1d..50f354df1cd 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -17,13 +17,12 @@
 #include "mysys_priv.h"
 #include <m_string.h>
 
-	/*
-	  Formats a filename with possible replace of directory of extension
-	  Function can handle the case where 'to' == 'name'
-	  For a description of the flag values, consult my_sys.h
-	  The arguments should be in unix format.
-	*/
-
+/*
+  Formats a filename with possible replace of directory of extension
+  Function can handle the case where 'to' == 'name'
+  For a description of the flag values, consult my_sys.h
+  The arguments should be in unix format.
+*/
 
 my_string fn_format(my_string to, const char *name, const char *dir,
 		    const char *extension, uint flag)
@@ -54,8 +53,7 @@ my_string fn_format(my_string to, const char *name, const char *dir,
     pack_dirname(dev,dev);			/* Put in ./.. and ~/.. */
   if (flag & MY_UNPACK_FILENAME)
     (void) unpack_dirname(dev,dev);		/* Replace ~/.. with dir */
-  if (flag & MY_UNIX_PATH)
-    to_unix_path(dev);				/* Fix to MySQL representation */
+
   if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS)
   {
     if ((flag & MY_REPLACE_EXT) == 0)		/* If we should keep old ext */
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 69410e9faaa..3b5e277b56d 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -2750,9 +2750,12 @@ static int keycache_pthread_cond_wait(pthread_cond_t *cond,
   gettimeofday(&now, &tz);
   /* Prepare timeout value */
   timeout.tv_sec= now.tv_sec + KEYCACHE_TIMEOUT;
-  timeout.tv_nsec= now.tv_usec * 1000; /* timeval uses microseconds.         */
-                                        /* timespec uses nanoseconds.         */
-                                        /* 1 nanosecond = 1000 micro seconds. */
+ /*
+   timeval uses microseconds.
+   timespec uses nanoseconds.
+   1 nanosecond = 1000 micro seconds
+ */
+  timeout.tv_nsec= now.tv_usec * 1000;
   KEYCACHE_THREAD_TRACE_END("started waiting");
 #if defined(KEYCACHE_DEBUG)
   cnt++;
@@ -2762,17 +2765,15 @@ static int keycache_pthread_cond_wait(pthread_cond_t *cond,
 #endif
   rc= pthread_cond_timedwait(cond, mutex, &timeout);
   KEYCACHE_THREAD_TRACE_BEGIN("finished waiting");
-#if defined(KEYCACHE_DEBUG)
-  if (rc == ETIMEDOUT)
+  if (rc == ETIMEDOUT || rc == ETIME)
   {
+#if defined(KEYCACHE_DEBUG)
     fprintf(keycache_debug_log,"aborted by keycache timeout\n");
     fclose(keycache_debug_log);
     abort();
-  }
 #endif
-
-  if (rc == ETIMEDOUT)
     keycache_dump();
+  }
 
 #if defined(KEYCACHE_DEBUG)
   KEYCACHE_DBUG_ASSERT(rc != ETIMEDOUT);
diff --git a/mysys/my_os2cond.c b/mysys/my_os2cond.c
index 83a03d62046..bf3e85c26a9 100644
--- a/mysys/my_os2cond.c
+++ b/mysys/my_os2cond.c
@@ -22,7 +22,7 @@
 ** The following is a simple implementation of posix conditions
 *****************************************************************************/
 
-#undef SAFE_MUTEX			/* Avoid safe_mutex redefinitions */
+#undef SAFE_MUTEX                       /* Avoid safe_mutex redefinitions */
 #include "mysys_priv.h"
 #if defined(THREAD) && defined(OS2)
 #include <m_string.h>
@@ -31,134 +31,109 @@
 
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
 {
-   APIRET	   rc = 0;
-   HEV		   event;
-   cond->waiting=0;
-   /* Warp3 FP29 or Warp4 FP4 or better required */
-   rc = DosCreateEventSem( NULL, &cond->semaphore, 0x0800, 0);
-   if (rc)
-      return ENOMEM;
-
+  cond->waiting= 0;
+  /* Warp3 FP29 or Warp4 FP4 or better required */
+  if (DosCreateEventSem(NULL, &cond->semaphore, 0x0800, 0))
+    return ENOMEM;
   return 0;
 }
 
 int pthread_cond_destroy(pthread_cond_t *cond)
 {
-   APIRET   rc;
-
-   do {
-      rc = DosCloseEventSem(cond->semaphore);
-      if (rc == 301) DosPostEventSem(cond->semaphore);
-   } while (rc == 301);
-   if (rc)
-      return EINVAL;
-
-	return 0;
+  for (;;)
+  {
+    APIRET rc;
+    if ((rc= DosCloseEventSem(cond->semaphore)) != 301)
+      return rc ? EINVAL : 0;
+    DosPostEventSem(cond->semaphore);
+  }
 }
 
 
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 {
-   APIRET   rc;
-   int	    rval;
-
-   rval = 0;
-   cond->waiting++;
-
-   if (mutex) pthread_mutex_unlock(mutex);
-
-   rc = DosWaitEventSem(cond->semaphore,SEM_INDEFINITE_WAIT);
-   if (rc != 0)
-      rval = EINVAL;
-
-   if (mutex) pthread_mutex_lock(mutex);
-
-   cond->waiting--;
-
-   return rval;
+  int rval= 0;
+  cond->waiting++;
+  if (mutex)
+    pthread_mutex_unlock(mutex);
+  if (DosWaitEventSem(cond->semaphore, SEM_INDEFINITE_WAIT))
+    rval= EINVAL;
+  if (mutex)
+    pthread_mutex_lock(mutex);
+  cond->waiting--;
+  return rval;
 }
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime)
+                           struct timespec *abstime)
 {
   struct timeb curtime;
   int result;
   long timeout;
-   APIRET   rc;
-   int	    rval;
-
-   _ftime(&curtime);
-   timeout= ((long) (abstime->ts_sec - curtime.time)*1000L +
-		    (long)((abstime->ts_nsec/1000) - curtime.millitm)/1000L);
-   if (timeout < 0)				/* Some safety */
-      timeout = 0L;
+  int rval= 0;
 
-   rval = 0;
-   cond->waiting++;
+  _ftime(&curtime);
+  timeout= ((long) (abstime->ts_sec - curtime.time) * 1000L +
+            (long) ((abstime->ts_nsec / 1000) - curtime.millitm) / 1000L);
+  if (timeout < 0)                              /* Some safety */
+    timeout= 0L;
 
-   if (mutex) pthread_mutex_unlock(mutex);
+  cond->waiting++;
 
-   rc = DosWaitEventSem(cond->semaphore, timeout);
-   if (rc != 0)
-      rval= ETIMEDOUT;
+  if (mutex)
+    pthread_mutex_unlock(mutex);
+  if (DosWaitEventSem(cond->semaphore, timeout) != 0)
+    rval= ETIMEDOUT;
+  if (mutex)
+    pthread_mutex_lock(mutex);
 
-   if (mutex) pthread_mutex_lock(mutex);
+  cond->waiting--;
 
-   cond->waiting--;
-
-   return rval;
+  return rval;
 }
 
 
 int pthread_cond_signal(pthread_cond_t *cond)
 {
-   APIRET   rc;
-
-   /* Bring the next thread off the condition queue: */
-   rc = DosPostEventSem(cond->semaphore);
-   return 0;
+  /* Bring the next thread off the condition queue: */
+  DosPostEventSem(cond->semaphore);
+  return 0;
 }
 
 
 int pthread_cond_broadcast(pthread_cond_t *cond)
 {
-   int	    i;
-   APIRET   rc;
-
-		/*
-		 * Enter a loop to bring all threads off the
-		 * condition queue:
-		 */
-   i = cond->waiting;
-   while (i--) rc = DosPostEventSem(cond->semaphore);
-
-   return 0 ;
+  int i;
+  /* Enter a loop to bring all threads off the condition queue */
+  for (i= cond->waiting; i--;)
+    DosPostEventSem(cond->semaphore);
+  return 0;
 }
 
 
 int pthread_attr_init(pthread_attr_t *connect_att)
 {
-  connect_att->dwStackSize	= 0;
-  connect_att->dwCreatingFlag	= 0;
-  connect_att->priority		= 0;
+  connect_att->dwStackSize= 0;
+  connect_att->dwCreatingFlag= 0;
+  connect_att->priority= 0;
   return 0;
 }
 
-int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack)
+int pthread_attr_setstacksize(pthread_attr_t *connect_att, DWORD stack)
 {
-  connect_att->dwStackSize=stack;
+  connect_att->dwStackSize= stack;
   return 0;
 }
 
-int pthread_attr_setprio(pthread_attr_t *connect_att,int priority)
+int pthread_attr_setprio(pthread_attr_t *connect_att, int priority)
 {
-  connect_att->priority=priority;
+  connect_att->priority= priority;
   return 0;
 }
 
 int pthread_attr_destroy(pthread_attr_t *connect_att)
 {
-  bzero((gptr) connect_att,sizeof(*connect_att));
+  bzero((gptr) connect_att, sizeof(*connect_att));
   return 0;
 }
 
@@ -166,22 +141,22 @@ int pthread_attr_destroy(pthread_attr_t *connect_att)
 ** Fix localtime_r() to be a bit safer
 ****************************************************************************/
 
-struct tm *localtime_r(const time_t *timep,struct tm *tmp)
+struct tm *localtime_r(const time_t *timep, struct tm *tmp)
 {
-  if (*timep == (time_t) -1)			/* This will crash win32 */
+  if (*timep == (time_t) - 1)                   /* This will crash win32 */
   {
-    bzero(tmp,sizeof(*tmp));
+    bzero(tmp, sizeof(*tmp));
   }
   else
   {
-    struct tm *res=localtime(timep);
-    if (!res)					/* Wrong date */
+    struct tm *res= localtime(timep);
+    if (!res)                                   /* Wrong date */
     {
-      bzero(tmp,sizeof(*tmp));			/* Keep things safe */
+      bzero(tmp, sizeof(*tmp));                 /* Keep things safe */
       return 0;
     }
     *tmp= *res;
   }
   return tmp;
 }
-#endif /* __WIN__ */
+#endif                                          /* __WIN__ */
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 41266d61b0a..f5a8b618949 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -408,9 +408,10 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
     set_timespec(wait_timeout, table_lock_wait_timeout);
   while (!thread_var->abort || in_wait_list)
   {
-    int rc= can_deadlock ? pthread_cond_timedwait(cond, &data->lock->mutex,
-                                                  &wait_timeout) :
-                           pthread_cond_wait(cond, &data->lock->mutex);
+    int rc= (can_deadlock ?
+             pthread_cond_timedwait(cond, &data->lock->mutex,
+                                    &wait_timeout) :
+             pthread_cond_wait(cond, &data->lock->mutex));
     /*
       We must break the wait if one of the following occurs:
       - the connection has been aborted (!thread_var->abort), but
@@ -426,7 +427,7 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
     */
     if (data->cond == 0)
       break;
-    if (rc == ETIMEDOUT)
+    if (rc == ETIMEDOUT || rc == ETIME)
     {
       result= THR_LOCK_WAIT_TIMEOUT;
       break;
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 2facb4e18cf..3326068d164 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -239,7 +239,7 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
   pthread_mutex_unlock(&mp->global);
   error=pthread_cond_timedwait(cond,&mp->mutex,abstime);
 #ifdef EXTRA_DEBUG
-  if (error && (error != EINTR && error != ETIMEDOUT))
+  if (error && (error != EINTR && error != ETIMEDOUT && error != ETIME))
   {
     fprintf(stderr,"safe_mutex: Got error: %d (%d) when doing a safe_mutex_timedwait at %s, line %d\n", error, errno, file, line);
   }