mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 07:35:32 +02:00
Merge.
This commit is contained in:
commit
c1feaf8d8a
5 changed files with 82 additions and 9 deletions
15
sql/item.cc
15
sql/item.cc
|
|
@ -951,6 +951,21 @@ void Item::set_name(const char *str, uint length, CHARSET_INFO *cs)
|
|||
}
|
||||
|
||||
|
||||
void Item::set_name_for_rollback(THD *thd, const char *str, uint length,
|
||||
CHARSET_INFO *cs)
|
||||
{
|
||||
char *old_name, *new_name;
|
||||
old_name= name;
|
||||
set_name(str, length, cs);
|
||||
new_name= name;
|
||||
if (old_name != new_name)
|
||||
{
|
||||
name= old_name;
|
||||
thd->change_item_tree((Item **) &name, (Item *) new_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@details
|
||||
This function is called when:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue