mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-08-14 10:56:11 +03:00
commit 757c368139
61 changed files with 2229 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8006,7 +8006,10 @@ set_max_autoinc:
if (wsrep_append_keys(m_user_thd, WSREP_SERVICE_KEY_EXCLUSIVE,
record,
NULL)) {
DBUG_PRINT("wsrep", ("row key failed"));
WSREP_DEBUG("::write_rows::wsrep_append_keys failed THD %ld for %s.%s",
thd_get_thread_id(m_user_thd),
table->s->db.str,
table->s->table_name.str);
error_result = HA_ERR_INTERNAL_ERROR;
goto func_exit;
}
@ -8716,8 +8719,10 @@ func_exit:
Check THD-level wsrep state in that case. */
(trx->is_wsrep() || (!trx_is_started(trx) && wsrep_on(m_user_thd)))
&& wsrep_thd_is_local(m_user_thd)
&& !wsrep_thd_ignore_table(m_user_thd)) {
DBUG_PRINT("wsrep", ("update row key"));
&& !wsrep_thd_ignore_table(m_user_thd)
&& (thd_sql_command(m_user_thd) != SQLCOM_CREATE_TABLE)
&& (thd_sql_command(m_user_thd) != SQLCOM_LOAD ||
thd_binlog_format(m_user_thd) == BINLOG_FORMAT_ROW)) {
/* We use table-level exclusive key for SEQUENCES
and normal key append for others. */
@ -8729,8 +8734,10 @@ func_exit:
? WSREP_SERVICE_KEY_UPDATE
: WSREP_SERVICE_KEY_EXCLUSIVE,
old_row, new_row)) {
WSREP_DEBUG("WSREP: UPDATE_ROW_KEY FAILED");
DBUG_PRINT("wsrep", ("row key failed"));
WSREP_DEBUG("::update_rows::wsrep_append_keys failed THD %ld for %s.%s",
thd_get_thread_id(m_user_thd),
table->s->db.str,
table->s->table_name.str);
DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
}
}
@ -8782,7 +8789,10 @@ ha_innobase::delete_row(
if (wsrep_append_keys(m_user_thd, WSREP_SERVICE_KEY_EXCLUSIVE,
record,
NULL)) {
DBUG_PRINT("wsrep", ("delete fail"));
WSREP_DEBUG("::delete_rows::wsrep_append_keys failed THD %ld for %s.%s",
thd_get_thread_id(m_user_thd),
table->s->db.str,
table->s->table_name.str);
DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
}
}