diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
| commit | 003cb2f42477772ae43228c0bc0f8492246b9340 (patch) | |
| tree | 680314d232d55b5a41dc2b2f5b500677e4aff183 /sql/sql_test.cc | |
| parent | 84ed288f6807a4602e0af8615bfb17080df15160 (diff) | |
| parent | 58e0dcb93dc2b2bf49f76c754bd216dbdf875a0d (diff) | |
| download | mariadb-git-003cb2f42477772ae43228c0bc0f8492246b9340.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 39693de80ae..56d10ddaa13 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -85,8 +85,9 @@ static my_bool print_cached_tables_callback(TDC_element *element, while ((entry= it++)) { THD *in_use= entry->in_use; - printf("%-14.14s %-32s%6ld%8ld%6d %s\n", - entry->s->db.str, entry->s->table_name.str, element->version, + printf("%-14.14s %-32s%6lu%8ld%6d %s\n", + entry->s->db.str, entry->s->table_name.str, + (ulong) element->version, in_use ? (long) in_use->thread_id : (long) 0, entry->db_stat ? 1 : 0, in_use ? lock_descriptions[(int)entry->reginfo.lock_type] : @@ -106,7 +107,8 @@ static void print_cached_tables(void) tdc_iterate(0, (my_hash_walk_action) print_cached_tables_callback, NULL, true); - printf("\nCurrent refresh version: %ld\n", tdc_refresh_version()); + printf("\nCurrent refresh version: %ld\n", + (long) tdc_refresh_version()); fflush(stdout); /* purecov: end */ return; |