Commit 9d5967f7 authored by Nikita Malyavin's avatar Nikita Malyavin

fixup 0bd9f755 MDEV-26062

Pass char* to WSREP_LOG and others, instead of non-POD objects
parent 43099af9
...@@ -2475,13 +2475,13 @@ row_upd_sec_index_entry( ...@@ -2475,13 +2475,13 @@ row_upd_sec_index_entry(
case DB_LOCK_WAIT_TIMEOUT: case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: " WSREP_DEBUG("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name, ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
default: default:
WSREP_ERROR("Foreign key check fail: " WSREP_ERROR("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name, ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
} }
...@@ -2810,14 +2810,14 @@ row_upd_clust_rec_by_insert( ...@@ -2810,14 +2810,14 @@ row_upd_clust_rec_by_insert(
case DB_LOCK_WAIT_TIMEOUT: case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: " WSREP_DEBUG("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name, ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
goto err_exit; goto err_exit;
default: default:
WSREP_ERROR("Foreign key check fail: " WSREP_ERROR("Foreign key check fail: "
"%s on table %s index %s query %s", "%s on table %s index %s query %s",
ut_strerr(err), index->name, index->table->name, ut_strerr(err), index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
goto err_exit; goto err_exit;
...@@ -3041,13 +3041,13 @@ row_upd_del_mark_clust_rec( ...@@ -3041,13 +3041,13 @@ row_upd_del_mark_clust_rec(
case DB_LOCK_WAIT_TIMEOUT: case DB_LOCK_WAIT_TIMEOUT:
WSREP_DEBUG("Foreign key check fail: " WSREP_DEBUG("Foreign key check fail: "
"%d on table %s index %s query %s", "%d on table %s index %s query %s",
err, index->name, index->table->name, err, index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
default: default:
WSREP_ERROR("Foreign key check fail: " WSREP_ERROR("Foreign key check fail: "
"%d on table %s index %s query %s", "%d on table %s index %s query %s",
err, index->name, index->table->name, err, index->name(), index->table->name.m_name,
wsrep_thd_query(trx->mysql_thd)); wsrep_thd_query(trx->mysql_thd));
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment