database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

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


mysys/thr_lock.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged
This commit is contained in:
unknown
2005-07-22 12:36:17 -07:00
parent 6fd718dfbb 46b0edc444
commit 7bb359cd61
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config-win.h
View File

@@ -285,6 +285,7 @@ inline double ulonglong2double(ulonglong value)
*(((long *) T)+1) = *(((long*) &V)+1); } *(((long *) T)+1) = *(((long*) &V)+1); }
#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float)) #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 float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float)) #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define float8store(V,M) doublestore((V),(M)) #define float8store(V,M) doublestore((V),(M))

7
mysys/thr_lock.c
View File

@@ -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; struct st_my_thread_var *thread_var= my_thread_var;
pthread_cond_t *cond= &thread_var->suspend; pthread_cond_t *cond= &thread_var->suspend;
struct timeval now;
struct timespec wait_timeout; struct timespec wait_timeout;
enum enum_thr_lock_result result= THR_LOCK_ABORTED; enum enum_thr_lock_result result= THR_LOCK_ABORTED;
my_bool can_deadlock= test(data->owner->info->n_cursors); 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; data->cond= cond;
if (can_deadlock) if (can_deadlock)
{ set_timespec(wait_timeout, table_lock_wait_timeout);
gettimeofday(&now, 0);
wait_timeout.tv_sec= now.tv_sec + table_lock_wait_timeout;
wait_timeout.tv_nsec= now.tv_usec * 1000;
}
while (!thread_var->abort || in_wait_list) while (!thread_var->abort || in_wait_list)
{ {
int rc= can_deadlock ? pthread_cond_timedwait(cond, &data->lock->mutex, int rc= can_deadlock ? pthread_cond_timedwait(cond, &data->lock->mutex,

1
sql/ha_federated.cc
View File

@@ -765,7 +765,6 @@ uint ha_federated::convert_row_to_internal_format(byte *record, MYSQL_ROW row)
(*field)->move_field(-old_ptr); (*field)->move_field(-old_ptr);
} }
DBUG_DUMP("record", record, table->s->reclength);
DBUG_RETURN(0); DBUG_RETURN(0);
} }