diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-04-28 17:06:09 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-04-28 17:06:09 +0300 |
| commit | 4118e3fb97d7fd796f9aa78866f1e0041bf0c274 (patch) | |
| tree | 946fdb38d13e7b6a005d1306fbeea76065773245 | |
| parent | 3ac0c7d85d43442dbf392d6a0743ee5ae55e317b (diff) | |
| parent | 74b70e0d73a6f1d93bb6234c6d2b88e005ee643e (diff) | |
| download | mariadb-git-4118e3fb97d7fd796f9aa78866f1e0041bf0c274.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
| -rw-r--r-- | innobase/include/sync0sync.h | 2 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 1 | ||||
| -rw-r--r-- | innobase/sync/sync0arr.c | 1 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h index 38f1489682a..6ac16930583 100644 --- a/innobase/include/sync0sync.h +++ b/innobase/include/sync0sync.h @@ -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 */ diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 4a7d5448c52..ae47e9c18c2 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -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."); diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index ddc1472cf4c..78d1a36fcf3 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -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); diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index eaeb56b4983..0897cc72a4f 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -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; |