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 with 5.2

Browse Source
This commit is contained in:
Michael Widenius
2011-03-09 15:47:59 +02:00
parent b3f7eac530 ce675406ca
commit 139a2b64bf
1617 changed files with 25609 additions and 41019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysys/thr_lock.c
View File

@@ -182,8 +182,10 @@ static int check_lock(struct st_lock_list *list, const char* lock_type,
last_lock_type != TL_WRITE_CONCURRENT_INSERT)
{
fprintf(stderr,
"Warning: Found locks from different threads in %s at '%s'. org_lock_type: %d last_lock_type: %d new_lock_type: %d\n",
lock_type, where, list->data->type, last_lock_type, data->type);
"Warning: Found locks from different threads for lock '%s' in '%s' at '%s'. org_lock_type: %d last_lock_type: %d new_lock_type: %d\n",
data->lock->name ? data->lock->name : "",
lock_type, where, list->data->type, last_lock_type,
data->type);
return 1;
}
if (no_cond && data->cond)
@@ -410,6 +412,7 @@ void thr_lock_data_init(THR_LOCK *lock,THR_LOCK_DATA *data, void *param)
data->status_param=param;
data->cond=0;
data->priority= 0;
data->debug_print_param= 0;
}
@@ -884,6 +887,7 @@ void thr_unlock(THR_LOCK_DATA *data, uint unlock_flags)
data->type=TL_UNLOCK; /* Mark unlocked */
check_locks(lock,"after releasing lock",1);
wake_up_waiters(lock);
check_locks(lock,"end of thr_unlock",1);
pthread_mutex_unlock(&lock->mutex);
DBUG_VOID_RETURN;
}