mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge marko@build.mysql.com:/home/bk/mysql-4.0

Browse source 
into hundin.mysql.fi:/home/marko/l/mysql-4.0
This commit is contained in:
unknown 2004-04-28 17:06:09 +03:00
commit 4118e3fb97
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
innobase/include/sync0sync.h
View file

@ -218,7 +218,7 @@ void
mutex_get_debug_info(
/*=================*/
mutex_t* mutex, /* in: mutex */
char** file_name, /* out: file where requested */
const char** file_name, /* out: file where requested */
ulint* line, /* out: line where requested */
os_thread_id_t* thread_id); /* out: id of the thread which owns
the mutex */

1
innobase/srv/srv0start.c
View file

@ -1022,6 +1022,7 @@ NetWare. */
}
mutex_create(&srv_monitor_file_mutex);
mutex_set_level(&srv_monitor_file_mutex, SYNC_NO_ORDER_CHECK);
srv_monitor_file_name = mem_alloc(
strlen(fil_path_to_mysql_datadir) +
20 + sizeof "/innodb_status.");

1
innobase/sync/sync0arr.c
View file

@ -613,7 +613,6 @@ sync_array_detect_deadlock(
rw_lock_t* lock;
os_thread_id_t thread;
ibool ret;
rw_lock_t* lock;
rw_lock_debug_t*debug;
ut_a(arr && start && cell);

6
innobase/sync/sync0sync.c
View file

@ -515,7 +515,7 @@ void
mutex_get_debug_info(
/*=================*/
mutex_t* mutex, /* in: mutex */
char** file_name, /* out: file where requested */
const char** file_name, /* out: file where requested */
ulint* line, /* out: line where requested */
os_thread_id_t* thread_id) /* out: id of the thread which owns
the mutex */
@ -574,7 +574,7 @@ mutex_list_print_info(void)
/*=======================*/
{
mutex_t* mutex;
char* file_name;
const char* file_name;
ulint line;
os_thread_id_t thread_id;
ulint count = 0;
@ -772,7 +772,7 @@ sync_thread_levels_g(
if (mutex_get_lock_word(mutex) != 0) {
#ifdef UNIV_SYNC_DEBUG
char* file_name;
const char* file_name;
ulint line;
os_thread_id_t thread_id;