diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 13:52:22 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 13:52:22 +0300 |
| commit | dbda504275af5eded33f62f509bff0b46e1560e1 (patch) | |
| tree | 74fb0414d1157881c3555a2e4c006e9013510b90 /storage/innobase | |
| parent | 48b7245bf285b757aa46bd37c86b9c202705e3bb (diff) | |
| download | mariadb-git-dbda504275af5eded33f62f509bff0b46e1560e1.tar.gz | |
Fix merge error and compiler warning.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ad31598384c..2f1e3b41c47 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6003,14 +6003,12 @@ report_error: if (!error_result && wsrep_on(user_thd) && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE - && !wsrep_consistency_check(user_thd)) + && !wsrep_consistency_check(user_thd) && (sql_command != SQLCOM_CREATE_TABLE) && (sql_command != SQLCOM_LOAD || thd_binlog_format(user_thd) == BINLOG_FORMAT_ROW)) { - { - if (wsrep_append_keys(user_thd, false, record, NULL)) - { + if (wsrep_append_keys(user_thd, false, record, NULL)) { DBUG_PRINT("wsrep", ("row key failed")); error_result = HA_ERR_INTERNAL_ERROR; goto wsrep_error; @@ -13028,16 +13026,15 @@ static int innobase_wsrep_get_checkpoint(handlerton* hton, XID* xid) return 0; } -static void -wsrep_fake_trx_id( -/*==================*/ +static void wsrep_fake_trx_id( handlerton *hton, THD *thd) /*!< in: user thread handle */ { mutex_enter(&kernel_mutex); trx_id_t trx_id = trx_sys_get_new_trx_id(); mutex_exit(&kernel_mutex); - WSREP_DEBUG("innodb fake trx id: %lu thd: %s", trx_id, wsrep_thd_query(thd)); + WSREP_DEBUG("innodb fake trx id: %llu thd: %s", + trx_id, wsrep_thd_query(thd)); (void *)wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id); } |