database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Changed my_thread_id to int64 to fix compilation problem with

Browse Source 
my_atomic_add32_explicit on windows
Fixed that server_audit.c also works if one compiles with safemalloc
Fixed compiler warnings
This commit is contained in:
Monty
2016-02-08 22:34:41 +02:00
parent 1ab711bebb
commit b3093073b1
15 changed files with 113 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_prepare.cc
View File

@ -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;