Commit 53bb8fa6 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new


sql/item_func.cc:
  Auto merged
parents a1a05ac8 e4f2bd46

mysys/my_os2cond.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, 


   rc = DosWaitEventSem(cond->semaphore, timeout);

   if (rc != 0)

      rval = ETIME;

      rval= ETIMEDOUT;



   if (mutex) pthread_mutex_lock(mutex);

sql/item_func.cc

+5 −5
Original line number Diff line number Diff line
@@ -3157,7 +3157,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout) 
  THD* thd=current_thd;

  User_level_lock* ull;

  struct timespec abstime;

  int lock_name_len,error=0;

  int lock_name_len;

  lock_name_len=strlen(lock_name);

  pthread_mutex_lock(&LOCK_user_locks);
@@ -3191,8 +3191,8 @@ void debug_sync_point(const char* lock_name, uint lock_timeout) 


  set_timespec(abstime,lock_timeout);

  while (!thd->killed &&

	 (error=pthread_cond_timedwait(&ull->cond,&LOCK_user_locks,&abstime))

	 != ETIME && error != ETIMEDOUT && ull->locked) ;

         pthread_cond_timedwait(&ull->cond, &LOCK_user_locks,

                                &abstime) != ETIMEDOUT && ull->locked) ;

  if (ull->locked)

  {

    if (!--ull->count)
@@ -3294,14 +3294,14 @@ longlong Item_func_get_lock::val_int() 
  set_timespec(abstime,timeout);

  while (!thd->killed &&

	 (error=pthread_cond_timedwait(&ull->cond,&LOCK_user_locks,&abstime))

	 != ETIME && error != ETIMEDOUT && error != EINVAL && ull->locked) ;

         != ETIMEDOUT && error != EINVAL && ull->locked) ;

  if (thd->killed)

    error=EINTR;				// Return NULL

  if (ull->locked)

  {

    if (!--ull->count)

      delete ull;				// Should never happen

    if (error != ETIME && error != ETIMEDOUT)

    if (error != ETIMEDOUT)

    {

      error=1;

      null_value=1;				// Return NULL

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -2753,7 +2753,7 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name, 
    else

      pthread_cond_wait(&data_cond, &data_lock);

    DBUG_PRINT("info",("Got signal of master update or timed out"));

    if (error == ETIMEDOUT || error == ETIME)

    if (error == ETIMEDOUT)

    {

      error= -1;

      break;

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) 
#endif

	if (thd->killed || di->status)

	  break;

	if (error == ETIME || error == ETIMEDOUT)

	if (error == ETIMEDOUT)

	{

	  thd->killed= THD::KILL_CONNECTION;

	  break;