Skip to content

M
mariadb
Commit 871eb3e5 authored by aelkin/andrei@mysql1000.dsl.inet.fi's avatar aelkin/andrei@mysql1000.dsl.inet.fi
Browse files
Options

bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables 

changes for an assert and an updated results file.
parent 139e6acd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/r/mix_innodb_myisam_binlog.result
View file @ 871eb3e5
...@@ -447,7 +447,7 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ...@@ -447,7 +447,7 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
ERROR 23000: Duplicate entry '2' for key 1 ERROR 23000: Duplicate entry '2' for key 1
show master status /* the offset must denote there is the query */; show master status /* the offset must denote there is the query */;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 369 master-bin.000001 230
select count(*) from t1 /* must be 4 */; select count(*) from t1 /* must be 4 */;
count(*) count(*)
4 4
......
sql/sql_update.cc
View file @ 871eb3e5
...@@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errcode,const char *err) ...@@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errcode,const char *err)
if (trans_safe) if (trans_safe)
{ {
DBUG_ASSERT(transactional_tables); DBUG_ASSERT(!updated || transactional_tables);
(void) ha_autocommit_or_rollback(thd, 1); (void) ha_autocommit_or_rollback(thd, 1);
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7