database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge branch 'knielsen_log_event_read_validation_base_11.8' into 12.3

Browse Source 
This merges the	patch series that fixes	a lot of missing validation
checks for read_log_event(). The merge includes a few added fixes that
are needed in new code introduced in 12.3.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2026-10-22 12:23:06 +02:00
parent 9a1123dc45 9fdefe8a24
commit ffaba7b55c
767 changed files with 68460 additions and 4699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_insert.cc
View File

@@ -956,7 +956,8 @@ bool mysql_insert(THD *thd, TABLE_LIST *table_list,
if (thd->rgi_slave &&
(info.handle_duplicates == DUP_UPDATE) &&
(table->next_number_field != NULL) &&
rpl_master_has_bug(thd->rgi_slave->rli, 24432, TRUE, NULL, NULL))
rpl_master_has_bug(thd->rgi_slave->rli, RPL_BUG_MYSQL_24432,
TRUE, NULL, NULL))
goto abort;
#endif
@@ -4420,7 +4421,8 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
if (thd->rgi_slave &&
(info.handle_duplicates == DUP_UPDATE) &&
(table->next_number_field != NULL) &&
rpl_master_has_bug(thd->rgi_slave->rli, 24432, TRUE, NULL, NULL))
rpl_master_has_bug(thd->rgi_slave->rli, RPL_BUG_MYSQL_24432,
TRUE, NULL, NULL))
DBUG_RETURN(1);
#endif
@@ -5502,8 +5504,12 @@ bool select_create::send_eof()
if (!table->s->tmp_table)
{
#ifdef WITH_WSREP
// For partitioned tables need to look implementing hton
const handlerton* ht= table->file->partition_ht() ?
table->file->partition_ht() :
table->file->ht;
if (WSREP(thd) &&
table->file->ht->db_type == DB_TYPE_INNODB)
ht->db_type == DB_TYPE_INNODB)
{
if (thd->wsrep_trx_id() == WSREP_UNDEFINED_TRX_ID)
{