mirror of
https://github.com/MariaDB/server.git
synced 2026-04-28 19:25:32 +02:00
Manual merge
mysql-test/r/update.result: Auto merged mysql-test/t/update.test: Auto merged
This commit is contained in:
commit
c64d0fc634
4 changed files with 27 additions and 2 deletions
|
|
@ -2129,8 +2129,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
|
|||
lex->result->cleanup();
|
||||
lex->result->set_thd(thd);
|
||||
}
|
||||
|
||||
DBUG_VOID_RETURN;
|
||||
thd->allow_sum_func= 0;
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue