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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-02 11:04:54 +03:00
parent f9ab7b473a 7b42d892de
commit 5c3ff5cb93
143 changed files with 4033 additions and 2689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -64,6 +64,7 @@ void set_thd_stage_info(void *thd,
#include "wsrep_mysqld.h"
#ifdef WITH_WSREP
#include <inttypes.h>
/* wsrep-lib */
#include "wsrep_client_service.h"
#include "wsrep_client_state.h"
@ -4550,7 +4551,7 @@ public:
if (WSREP(this))
{
set_wsrep_next_trx_id(query_id);
WSREP_DEBUG("assigned new next trx id: %lu", wsrep_next_trx_id());
WSREP_DEBUG("assigned new next trx id: %" PRIu64, wsrep_next_trx_id());
}
#endif /* WITH_WSREP */
}