database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'github/bb-11.4-release' into bb-11.8-serg

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-27 11:33:27 +02:00
committed by Oleksandr Byelkin
parent a0b77eb806 a8d4642375
commit 237e24497b
430 changed files with 14769 additions and 6751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/handler.cc
View File

@@ -1954,6 +1954,8 @@ int ha_commit_trans(THD *thd, bool all)
}
#endif /* WITH_WSREP */
error= ha_commit_one_phase(thd, all);
if (error)
goto err;
#ifdef WITH_WSREP
// Here in case of error we must return 2 for inconsistency
if (run_wsrep_hooks && !error)
@@ -2194,16 +2196,16 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
if (ha_info)
{
int err;
int err= 0;
if (has_binlog_hton(ha_info))
{
if ((err= binlog_commit(thd, all,
is_ro_1pc_trans(thd, ha_info, all,
is_real_trans))))
if ((err= binlog_commit(thd, all, is_ro_1pc_trans(thd, ha_info, all,
is_real_trans))))
{
my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
error= 1;
goto err;
}
}
#ifdef WITH_WSREP
@@ -2246,7 +2248,7 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
if (count >= 2)
statistic_increment(transactions_multi_engine, LOCK_status);
}
err:
DBUG_RETURN(error);
}
@@ -8218,7 +8220,8 @@ int handler::ha_write_row(const uchar *buf)
TABLE_IO_WAIT(tracker, PSI_TABLE_WRITE_ROW, MAX_KEY, error,
{ error= write_row(buf); })
DBUG_PRINT("dml", ("INSERT: %s = %d", dbug_print_row(table, buf, false), error));
DBUG_PRINT("dml", ("INSERT: %s = %d",
dbug_format_row(table, buf, false).c_ptr_safe(), error));
MYSQL_INSERT_ROW_DONE(error);
if (!error && !((error= table->hlindexes_on_insert())))
@@ -8268,8 +8271,10 @@ int handler::ha_update_row(const uchar *old_data, const uchar *new_data)
TABLE_IO_WAIT(tracker, PSI_TABLE_UPDATE_ROW, active_index, 0,
{ error= update_row(old_data, new_data);})
DBUG_PRINT("dml", ("UPDATE: %s => %s = %d", dbug_print_row(table, old_data, false),
dbug_print_row(table, new_data, false), error));
DBUG_PRINT("dml", ("UPDATE: %s => %s = %d",
dbug_format_row(table, old_data, false).c_ptr_safe(),
dbug_format_row(table, new_data, false).c_ptr_safe(),
error));
MYSQL_UPDATE_ROW_DONE(error);
if (likely(!error) && !(error= table->hlindexes_on_update()))
@@ -8347,7 +8352,8 @@ int handler::ha_delete_row(const uchar *buf)
TABLE_IO_WAIT(tracker, PSI_TABLE_DELETE_ROW, active_index, error,
{ error= delete_row(buf);})
DBUG_PRINT("dml", ("DELETE: %s = %d", dbug_print_row(table, buf, false), error));
DBUG_PRINT("dml", ("DELETE: %s = %d",
dbug_format_row(table, buf, false).c_ptr_safe(), error));
MYSQL_DELETE_ROW_DONE(error);
if (likely(!error) && !(error= table->hlindexes_on_delete(buf)))
{
@@ -8689,16 +8695,6 @@ int del_global_index_stat(THD *thd, TABLE* table, KEY* key_info)
VERSIONING functions
******************************************************************************/
bool Vers_parse_info::is_start(const LEX_CSTRING &name) const
{
DBUG_ASSERT(name.str);
return as_row.start && as_row.start.streq(name);
}
bool Vers_parse_info::is_end(const LEX_CSTRING &name) const
{
DBUG_ASSERT(name.str);
return as_row.end && as_row.end.streq(name);
}
bool Vers_parse_info::is_start(const Create_field &f) const
{
return f.flags & VERS_ROW_START;