diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-14 08:47:22 +0200 |
| commit | 28f08d3753eb10a1393a63e6c581d43aad9f93b9 (patch) | |
| tree | 86c9df8c3fb6d4ebd99d431697c84f06ef242989 /sql/handler.cc | |
| parent | 38665893087e20c3ad65d5b0e227a75185a4865e (diff) | |
| parent | f1bcfbb4373e40dda2c18c137f76fc6ff32e1a45 (diff) | |
| download | mariadb-git-28f08d3753eb10a1393a63e6c581d43aad9f93b9.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 36babb96415..da41daf2440 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -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; } |