diff options
| author | Monty <monty@mariadb.org> | 2016-02-08 22:34:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-08 22:34:41 +0200 |
| commit | b3093073b1ec076ad7ef5ef8b8fca9022864a890 (patch) | |
| tree | 4a703f74b194efb2d02b2acfcf8d91f03deaa1f5 /sql/wsrep_applier.cc | |
| parent | 1ab711bebbd961b8882acf0ac0fbdd1971d54597 (diff) | |
| download | mariadb-git-b3093073b1ec076ad7ef5ef8b8fca9022864a890.tar.gz | |
Changed my_thread_id to int64 to fix compilation problem with
my_atomic_add32_explicit on windows
Fixed that server_audit.c also works if one compiles with safemalloc
Fixed compiler warnings
Diffstat (limited to 'sql/wsrep_applier.cc')
| -rw-r--r-- | sql/wsrep_applier.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index c1c6a90e614..e098fc95897 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -269,8 +269,8 @@ wsrep_cb_status_t wsrep_apply_cb(void* const ctx, TABLE *tmp; while ((tmp = thd->temporary_tables)) { - WSREP_DEBUG("Applier %lu, has temporary tables: %s.%s", - thd->thread_id, + WSREP_DEBUG("Applier %lld, has temporary tables: %s.%s", + (longlong) thd->thread_id, (tmp->s) ? tmp->s->db.str : "void", (tmp->s) ? tmp->s->table_name.str : "void"); close_temporary_table(thd, tmp, 1, 1); |