Commit 7bb359cd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-build 

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


mysys/thr_lock.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged
parents 6fd718df 46b0edc4

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ inline double ulonglong2double(ulonglong value) 
			   *(((long *) T)+1) = *(((long*) &V)+1); }

#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }

#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))

#define floatget(V,M)   memcpy((byte*)(&V), (byte*)(M), sizeof(float))

#define float8get(V,M) doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define float8store(V,M) doublestore((V),(M))

mysys/thr_lock.c

+1 −6
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, 
{

  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 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, 
  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,

sql/ha_federated.cc

+0 −1
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ uint ha_federated::convert_row_to_internal_format(byte *record, MYSQL_ROW row) 
    (*field)->move_field(-old_ptr);

  }



  DBUG_DUMP("record", record, table->s->reclength);

  DBUG_RETURN(0);

}