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/sql_connect.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/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index c02db1b3947..ea114bf40a5 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1139,8 +1139,8 @@ void end_connection(THD *thd) { wsrep_status_t rcode= wsrep->free_connection(wsrep, thd->thread_id); if (rcode) { - WSREP_WARN("wsrep failed to free connection context: %lu, code: %d", - thd->thread_id, rcode); + WSREP_WARN("wsrep failed to free connection context: %lld code: %d", + (longlong) thd->thread_id, rcode); } } thd->wsrep_client_thread= 0; |