diff options
| author | unknown <monty@mysql.com> | 2004-05-05 17:05:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-05 17:05:24 +0300 |
| commit | cd21f7ce40ac4c7d415544a5b2aa07b1278419ac (patch) | |
| tree | 3238bd16530e02dbfef96513749a73b7294880f8 /innobase/sync | |
| parent | 575541b9f755425eaeb07babfa07b6fd30f6d5d1 (diff) | |
| parent | 7d918f213e64df4af4b00d0798fadf9ed1a872fb (diff) | |
| download | mariadb-git-cd21f7ce40ac4c7d415544a5b2aa07b1278419ac.tar.gz | |
Merge with 4.0.19
BitKeeper/etc/logging_ok:
auto-union
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
extra/perror.c:
Auto merged
extra/replace.c:
Auto merged
innobase/configure.in:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
ltmain.sh:
Auto merged
BitKeeper/deleted/.del-libmysqld.def~8edf7b8780ce943c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
mysql-test/r/alias.result:
Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
Auto merged
mysql-test/r/func_time.result:
Automatic merge
mysql-test/r/innodb.result:
Automatic merge
mysql-test/t/alias.test:
Automatic merge
mysql-test/t/create.test:
Automatic merge
mysql-test/t/func_time.test:
Automatic merge
sql/ha_innodb.cc:
Automatic merge
sql/mysql_priv.h:
Automatic merge
mysql-test/r/rpl_multi_update.result:
Automatic merge
mysql-test/t/rpl_error_ignored_table.test:
Automatic merge
mysql-test/t/rpl_multi_update.test:
Automatic merge
sql/slave.h:
Automatic merge
sql/sql_base.cc:
Automatic merge
sql/sql_db.cc:
Automatic merge
sql/sql_insert.cc:
Automatic merge
sql/structs.h:
Automatic merge
sql/table.cc:
Automatic merge
strings/longlong2str-x86.s:
Automatic merge
strings/strings-x86.s:
Automatic merge
support-files/my-medium.cnf.sh:
Automatic merge
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; |