diff options
| author | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
| commit | d21d49a32a1689d2c486a449574e120d7a2f60c4 (patch) | |
| tree | 3238bd16530e02dbfef96513749a73b7294880f8 /innobase/sync | |
| parent | 104fdf607d312bb13f24063d28d993243bf24ca2 (diff) | |
| parent | e51887b05082622a1882217b7f8ec8ae7f6b4598 (diff) | |
| download | mariadb-git-d21d49a32a1689d2c486a449574e120d7a2f60c4.tar.gz | |
Merge with 4.0.19
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0arr.c | 1 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index 1268b22e2f8..426d7ff9f92 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -618,7 +618,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 e711acbf84e..c1fb31bc966 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -531,7 +531,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 */ @@ -590,7 +590,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; @@ -788,7 +788,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; |