bk commit into 5.0 tree (jimw:1.1892)

[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.1892 05/07/22 12:36:17 jimw@stripped +2 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-build
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/ha_federated.cc
    1.37 05/07/22 12:36:14 jimw@stripped +0 -0
    Auto merged

  mysys/thr_lock.c
    1.45 05/07/22 12:36:14 jimw@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.44/mysys/thr_lock.c	2005-07-20 22:29:53 -07:00
+++ 1.45/mysys/thr_lock.c	2005-07-22 12:36:14 -07:00
@@ -388,7 +388,6 @@
 {
   struct st_my_thread_var *thread_var= my_thread_var;
   pthread_cond_t *cond= &thread_var->suspend;
-  struct timeval now;
   struct timespec wait_timeout;
   enum enum_thr_lock_result result= THR_LOCK_ABORTED;
   my_bool can_deadlock= test(data->owner->info->n_cursors);
@@ -406,11 +405,7 @@
   data->cond= cond;
 
   if (can_deadlock)
-  {
-    gettimeofday(&now, 0);
-    wait_timeout.tv_sec= now.tv_sec + table_lock_wait_timeout;
-    wait_timeout.tv_nsec= now.tv_usec * 1000;
-  }
+    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,

--- 1.36/sql/ha_federated.cc	2005-07-20 09:02:25 -07:00
+++ 1.37/sql/ha_federated.cc	2005-07-22 12:36:14 -07:00
@@ -765,7 +765,6 @@
     (*field)->move_field(-old_ptr);
   }
 
-  DBUG_DUMP("record", record, table->s->reclength);
   DBUG_RETURN(0);
 }