From 8224c76fbd1570d0afac76ee25e120bc5544cd7d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Dec 2007 23:57:28 +0200 Subject: Removed MARIA_BASE min_row_length (duplicate of min_block_length) Cleanup of recent code changes in dbug and my_thr_init Added name for each safe_mutex (for better DBUG and error reporting) Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk Removed duplicate printing of mutex address in dbug log dbug/dbug.c: Cleanup of recent code changes include/my_pthread.h: Added name for each safe_mutex (for better DBUG and error reporting) mysys/my_thr_init.c: Cleanup of recent code changes mysys/thr_mutex.c: Added name for each safe_mutex (for better DBUG and error reporting) mysys/wqueue.c: Removed some mutex printing (as it's done now when we take mutex) storage/maria/Makefile.am: Fixed that 'make tags' works with xemacs storage/maria/ma_blockrec.c: base.min_row_length -> base.min_block_length (As they where basicly the same variable) storage/maria/ma_check.c: Moved more common stuff to initialize_variables_for_repair Fixed that sort_info.max_records is calculated correctly. This fixed a bug in maria_chk storage/maria/ma_create.c: More comments Fixed that min_pack_length is calculated more correctly Removed duplicate variable base.min_row_length storage/maria/ma_loghandler.c: Removed duplicate printing of mutex address storage/maria/ma_open.c: Removed base.min_row_length storage/maria/ma_packrec.c: Removed not anymore needed code (One should not change any .base variables as this will affect repair with unpack) storage/maria/maria_def.h: Removed base.min_row_length --- mysys/wqueue.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mysys/wqueue.c') diff --git a/mysys/wqueue.c b/mysys/wqueue.c index 28e044ff606..bfe9cba1235 100644 --- a/mysys/wqueue.c +++ b/mysys/wqueue.c @@ -147,18 +147,20 @@ void wqueue_release_queue(WQUEUE *wqueue) */ void wqueue_add_and_wait(WQUEUE *wqueue, - struct st_my_thread_var *thread, pthread_mutex_t *lock) + struct st_my_thread_var *thread, + pthread_mutex_t *lock) { DBUG_ENTER("wqueue_add_and_wait"); - DBUG_PRINT("enter", ("thread ox%lxcond 0x%lx, mutex 0x%lx", - (ulong) thread, (ulong) &thread->suspend, (ulong) lock)); + DBUG_PRINT("enter", + ("thread: 0x%lx cond: 0x%lx mutex: 0x%lx", + (ulong) thread, (ulong) &thread->suspend, (ulong) lock)); wqueue_add_to_queue(wqueue, thread); do { - DBUG_PRINT("info", ("wait... cond 0x%lx, mutex 0x%lx", + DBUG_PRINT("info", ("wait... cond: 0x%lx mutex: 0x%lx", (ulong) &thread->suspend, (ulong) lock)); pthread_cond_wait(&thread->suspend, lock); - DBUG_PRINT("info", ("wait done cond 0x%lx, mutex 0x%lx, next 0x%lx", + DBUG_PRINT("info", ("wait done cond: 0x%lx mutex: 0x%lx next: 0x%lx", (ulong) &thread->suspend, (ulong) lock, (ulong) thread->next)); } -- cgit v1.2.1