mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix integer type mismatch in WSREP debug output

Browse source
This commit is contained in:
Marko Mäkelä 2017-11-08 09:26:27 +02:00
parent 28c3459aa7
commit 644ffdeb92
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/handler/ha_innodb.cc
View file

@ -10418,7 +10418,7 @@ wsrep_append_foreign_key(
shared ? WSREP_KEY_SHARED : WSREP_KEY_EXCLUSIVE, shared ? WSREP_KEY_SHARED : WSREP_KEY_EXCLUSIVE,
copy); copy);
if (rcode) { if (rcode) {
DBUG_PRINT("wsrep", ("row key failed: %lu", rcode)); DBUG_PRINT("wsrep", ("row key failed: %zu", rcode));
WSREP_ERROR("Appending cascaded fk row key failed: %s, %lu", WSREP_ERROR("Appending cascaded fk row key failed: %s, %lu",
(wsrep_thd_query(thd)) ? (wsrep_thd_query(thd)) ?
wsrep_thd_query(thd) : "void", rcode); wsrep_thd_query(thd) : "void", rcode);
@ -18709,7 +18709,7 @@ wsrep_innobase_kill_one_trx(
wsrep_thd_awake(thd, signal); wsrep_thd_awake(thd, signal);
} else { } else {
/* abort currently executing query */ /* abort currently executing query */
DBUG_PRINT("wsrep",("sending KILL_QUERY to: %ld", DBUG_PRINT("wsrep",("sending KILL_QUERY to: %lu",
thd_get_thread_id(thd))); thd_get_thread_id(thd)));
WSREP_DEBUG("kill query for: %ld", WSREP_DEBUG("kill query for: %ld",
thd_get_thread_id(thd)); thd_get_thread_id(thd));
@ -18840,7 +18840,8 @@ wsrep_fake_trx_id(
mutex_enter(&trx_sys->mutex); mutex_enter(&trx_sys->mutex);
trx_id_t trx_id = trx_sys_get_new_trx_id(); trx_id_t trx_id = trx_sys_get_new_trx_id();
mutex_exit(&trx_sys->mutex); mutex_exit(&trx_sys->mutex);
WSREP_DEBUG("innodb fake trx id: %lu thd: %s", trx_id, wsrep_thd_query(thd)); WSREP_DEBUG("innodb fake trx id: " TRX_ID_FMT " thd: %s",
trx_id, wsrep_thd_query(thd));
wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id); wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id);
} }

7
storage/xtradb/handler/ha_innodb.cc
View file

@ -10984,7 +10984,7 @@ wsrep_append_foreign_key(
shared ? WSREP_KEY_SHARED : WSREP_KEY_EXCLUSIVE, shared ? WSREP_KEY_SHARED : WSREP_KEY_EXCLUSIVE,
copy); copy);
if (rcode) { if (rcode) {
DBUG_PRINT("wsrep", ("row key failed: %lu", rcode)); DBUG_PRINT("wsrep", ("row key failed: %zu", rcode));
WSREP_ERROR("Appending cascaded fk row key failed: %s, %lu", WSREP_ERROR("Appending cascaded fk row key failed: %s, %lu",
(wsrep_thd_query(thd)) ? (wsrep_thd_query(thd)) ?
wsrep_thd_query(thd) : "void", rcode); wsrep_thd_query(thd) : "void", rcode);
@ -19751,7 +19751,7 @@ wsrep_innobase_kill_one_trx(
wsrep_thd_awake(thd, signal); wsrep_thd_awake(thd, signal);
} else { } else {
/* abort currently executing query */ /* abort currently executing query */
DBUG_PRINT("wsrep",("sending KILL_QUERY to: %ld", DBUG_PRINT("wsrep",("sending KILL_QUERY to: %lu",
thd_get_thread_id(thd))); thd_get_thread_id(thd)));
WSREP_DEBUG("kill query for: %ld", WSREP_DEBUG("kill query for: %ld",
thd_get_thread_id(thd)); thd_get_thread_id(thd));
@ -19878,7 +19878,8 @@ wsrep_fake_trx_id(
mutex_enter(&trx_sys->mutex); mutex_enter(&trx_sys->mutex);
trx_id_t trx_id = trx_sys_get_new_trx_id(); trx_id_t trx_id = trx_sys_get_new_trx_id();
mutex_exit(&trx_sys->mutex); mutex_exit(&trx_sys->mutex);
WSREP_DEBUG("innodb fake trx id: %lu thd: %s", trx_id, wsrep_thd_query(thd)); WSREP_DEBUG("innodb fake trx id: " TRX_ID_FMT " thd: %s",
trx_id, wsrep_thd_query(thd));
wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id); wsrep_ws_handle_for_trx(wsrep_thd_ws_handle(thd), trx_id);
} }