diff options
| author | unknown <jimw@mysql.com> | 2005-08-15 12:37:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-15 12:37:45 -0700 |
| commit | f6de082b08f07a705a5a701017b8a160adb02fc6 (patch) | |
| tree | a82f8fdfe2f9d907eddaa4718eac8f87481e47b3 /sql/sql_test.cc | |
| parent | 219c84faba28171cc04608f826703f5c031d70bc (diff) | |
| parent | 000a09baac6db1a2c4d943802d00fa96cf9a5083 (diff) | |
| download | mariadb-git-f6de082b08f07a705a5a701017b8a160adb02fc6.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
myisam/myisampack.c:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysys/list.c:
Auto merged
mysys/thr_lock.c:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 722568e7f53..ddd0f3fe162 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -370,7 +370,7 @@ static void display_table_locks(void) VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50)); VOID(pthread_mutex_lock(&THR_LOCK_lock)); - for (list=thr_lock_thread_list ; list ; list=rest(list)) + for (list= thr_lock_thread_list; list; list= list_rest(list)) { THR_LOCK *lock=(THR_LOCK*) list->data; |