diff options
| author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-05-29 16:27:55 +0300 |
|---|---|---|
| committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-05-29 16:27:55 +0300 |
| commit | 00710d17bbfac52eaac4a5283f4e08e8ffeefaf9 (patch) | |
| tree | eb2c05e6c7fba87e2cd4f32cb43af1ac256aab2f /sql/sql_insert.cc | |
| parent | f27bf2b4635202d73b2da712c2bb0f522083cc24 (diff) | |
| download | mariadb-git-00710d17bbfac52eaac4a5283f4e08e8ffeefaf9.tar.gz | |
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.
mysql-test/r/binlog_killed.result:
new result file
mysql-test/t/binlog_killed.test:
regression for bug#22725 simplified. tests for bug27563, BUG#27565 made inactive.
sql/sql_insert.cc:
DBUG_ASSERT
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 647681cdc1a..bf37a3d6d69 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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; } |