diff options
| author | kostja@bodhi.(none) <> | 2007-06-01 12:12:06 +0400 |
|---|---|---|
| committer | kostja@bodhi.(none) <> | 2007-06-01 12:12:06 +0400 |
| commit | 16633169e4ab381126388f1bb2a014e9423c8f86 (patch) | |
| tree | 2c2de88de3152746bd0ffaea698446ff1cede244 /sql/sql_test.cc | |
| parent | 685293b98584b36c568bd6a4fa6ded69f6ce5844 (diff) | |
| parent | 2c8f4f97910bec416fc9a375cf1c74be2ca395cc (diff) | |
| download | mariadb-git-16633169e4ab381126388f1bb2a014e9423c8f86.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 86744fb1bf5..5bd01eea68c 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -349,7 +349,7 @@ static void push_locks_into_array(DYNAMIC_ARRAY *ar, THR_LOCK_DATA *data, table_lock_info.lock_text=text; // lock_type is also obtainable from THR_LOCK_DATA table_lock_info.type=table->reginfo.lock_type; - VOID(push_dynamic(ar,(gptr) &table_lock_info)); + VOID(push_dynamic(ar,(uchar*) &table_lock_info)); } } } @@ -394,7 +394,7 @@ static void display_table_locks(void) VOID(pthread_mutex_unlock(&THR_LOCK_lock)); if (!saved_table_locks.elements) goto end; - qsort((gptr) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare); + qsort((uchar*) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare); freeze_size(&saved_table_locks); puts("\nThread database.table_name Locked/Waiting Lock_type\n"); |