diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 12:21:16 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 17:20:46 +0000 |
| commit | ccf21c99623caa8596ed2eecc72dcb039ef0ef54 (patch) | |
| tree | 34208e6b16e2140a0898c5e6282806cdb8a946ae /sql/sql_test.cc | |
| parent | 7354dc67737fdeb105656f5cec055da627bb9c29 (diff) | |
| download | mariadb-git-ccf21c99623caa8596ed2eecc72dcb039ef0ef54.tar.gz | |
fix some conversion warnings
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 e70872af6c5..feb99861c48 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -432,7 +432,7 @@ static void push_locks_into_array(DYNAMIC_ARRAY *ar, THR_LOCK_DATA *data, if (table && table->s->tmp_table == NO_TMP_TABLE) { TABLE_LOCK_INFO table_lock_info; - table_lock_info.thread_id= table->in_use->thread_id; + table_lock_info.thread_id= (ulong)table->in_use->thread_id; memcpy(table_lock_info.table_name, table->s->table_cache_key.str, table->s->table_cache_key.length); table_lock_info.table_name[strlen(table_lock_info.table_name)]='.'; |