1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events

Refining the tests since pb revealed the older version's fragality - the error from SF() due to killed
may be different on different env:s.
DBUG_ASSERT instead of assert.
This commit is contained in:
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
2007-05-29 16:27:55 +03:00
parent b8a5a770f0
commit 3b93001c25
3 changed files with 54 additions and 112 deletions

View File

@@ -898,7 +898,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
Query_log_event qinfo(thd, thd->query, thd->query_length,
transactional_table, FALSE,
(error>0) ? thd->killed : THD::NOT_KILLED);
assert(thd->killed != THD::KILL_BAD_DATA || error > 0);
DBUG_ASSERT(thd->killed != THD::KILL_BAD_DATA || error > 0);
if (mysql_bin_log.write(&qinfo) && transactional_table)
error=1;
}