database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-09-14 08:47:22 +02:00
parent 3866589308 f1bcfbb437
commit 28f08d3753
321 changed files with 6852 additions and 195819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@ -21,6 +21,7 @@
*/
#include <my_global.h>
#include <inttypes.h>
#include "sql_priv.h"
#include "unireg.h"
#include "rpl_handler.h"
@ -4384,6 +4385,7 @@ handler::ha_create_partitioning_metadata(const char *name,
(!old_name && strcmp(name, table_share->path.str)));
mark_trx_read_write();
return create_partitioning_metadata(name, old_name, action_flag);
}
@ -6188,7 +6190,7 @@ void ha_fake_trx_id(THD *thd)
if (thd->wsrep_ws_handle.trx_id != WSREP_UNDEFINED_TRX_ID)
{
WSREP_DEBUG("fake trx id skipped: %lu", thd->wsrep_ws_handle.trx_id);
WSREP_DEBUG("fake trx id skipped: %" PRIu64, thd->wsrep_ws_handle.trx_id);
DBUG_VOID_RETURN;
}