mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
fixes after merge. Updates to test's results.
We now reset the THD members related to auto_increment+binlog in MYSQL_LOG::write(). This is better than in THD::cleanup_after_query(), which was not able to distinguish between SELECT myfunc1(),myfunc2() and INSERT INTO t SELECT myfunc1(),myfunc2() from a binlogging point of view. Rows_log_event::exec_event() now calls lex_start() instead of mysql_init_query() because the latter now does too much (it resets the binlog format).
This commit is contained in:
parent
93ce19dfb6
commit
1cc3c80070
18 changed files with 245 additions and 199 deletions
|
|
@ -170,7 +170,7 @@ connection master;
|
|||
|
||||
drop function bug15728;
|
||||
drop function bug15728_insert;
|
||||
drop table t1, t2;
|
||||
drop table t1;
|
||||
drop procedure foo;
|
||||
|
||||
# test of BUG#20188 REPLACE or ON DUPLICATE KEY UPDATE in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue