bk commit into 5.0 tree (jimw:1.1991)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1991 05/08/17 19:57:07 jimw@stripped +1 -0
  Fix minor typo in handling of error conditions and return of SLEEP().

  sql/item_func.cc
    1.242 05/08/17 19:56:28 jimw@stripped +2 -2
    Remove unnecessary initialization, fix parens placement

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.241/sql/item_func.cc	2005-08-16 16:31:12 -07:00
+++ 1.242/sql/item_func.cc	2005-08-17 19:56:28 -07:00
@@ -3269,7 +3269,7 @@
   THD *thd= current_thd;
   struct timespec abstime;
   pthread_cond_t cond;
-  int error= 0;
+  int error;
 
   DBUG_ASSERT(fixed == 1);
 
@@ -3284,7 +3284,7 @@
 
   while (!thd->killed &&
          (error= pthread_cond_timedwait(&cond, &LOCK_user_locks,
-                                        &abstime) != ETIMEDOUT) &&
+                                        &abstime)) != ETIMEDOUT &&
          error != EINVAL) ;
 
   pthread_mutex_lock(&thd->mysys_var->mutex);