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_prepare.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_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index ca23e11676a..00b451c8821 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3893,8 +3893,9 @@ reexecute: switch (thd->wsrep_conflict_state) { case CERT_FAILURE: - WSREP_DEBUG("PS execute fail for CERT_FAILURE: thd: %ld err: %d", - thd->thread_id, thd->get_stmt_da()->sql_errno() ); + WSREP_DEBUG("PS execute fail for CERT_FAILURE: thd: %lld err: %d", + (longlong) thd->thread_id, + thd->get_stmt_da()->sql_errno() ); thd->wsrep_conflict_state = NO_CONFLICT; break; |