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

MDEV-34046 Parameterized PS converts error to warning, causes

Browse Source 
replication problems

DELETE HISTORY did not process parameterized PS properly as the
history expression was checked on prepare stage when the parameters
was not yet substituted. In that case check_units() succeeded as there
is no invalid type: Item_param has type_handler_null which is
inherited from string type and this is valid type for history
expression. The warning was thrown when the expression was evaluated
for comparison on delete execution (when the parameter was already
substituted).

The fix postpones check_units() until the first PS execution. We have
to postpone where conditions processing until the first execution and
update select_lex.where on every execution as it is reset to the state
after prepare.
This commit is contained in:
Aleksey Midenkov
2025-06-11 16:38:10 +03:00
parent bff9b1e472
commit f1f9284181
6 changed files with 357 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/sql_select.cc
View File

@@ -1279,10 +1279,25 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables)
}
if (vers_conditions.type == SYSTEM_TIME_ALL)
{
if (vers_conditions.has_param)
{
/*
Parameter substitution (set_params_from_actual_params()) works
on existing items so we don't have to reevaluate table->where
(in update_this below), we just update SELECT_LEX WHERE expression
from existing table conditions.
*/
DBUG_ASSERT(vers_conditions.delete_history);
DBUG_ASSERT(thd->stmt_arena->is_stmt_execute());
where= and_items(thd, where, table->where);
}
continue;
}
}
bool timestamps_only= table->table->versioned(VERS_TIMESTAMP);
bool update_this= update_conds;
if (vers_conditions.is_set() && vers_conditions.type != SYSTEM_TIME_HISTORY)
{
@@ -1299,9 +1314,23 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables)
my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), table->table_name.str);
DBUG_RETURN(-1);
}
if (vers_conditions.has_param)
{
/*
PS parameter in history expression requires processing at execution
stage when parameters has values substituted. So at prepare continue
the loop, but at execution enter update_this. The second execution
is skipped on vers_conditions.type == SYSTEM_TIME_ALL condition.
*/
DBUG_ASSERT(vers_conditions.delete_history);
if (thd->stmt_arena->is_stmt_prepare())
continue;
DBUG_ASSERT(thd->stmt_arena->is_stmt_execute());
update_this= true;
}
}
if (update_conds)
if (update_this)
{
vers_conditions.period = &table->table->s->vers;
Item *cond= period_get_condition(thd, table, this, &vers_conditions,