mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from 5.1 to 5.5

Browse source
This commit is contained in:
Sujatha Sivakumar 2012-09-17 11:53:34 +05:30
commit 8d5c44c9dd
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/log.cc
View file

@ -4863,12 +4863,18 @@ MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd,
/* /*
Write pending event to the cache. Write pending event to the cache.
*/ */
DBUG_EXECUTE_IF("simulate_disk_full_at_flush_pending",
{DBUG_SET("+d,simulate_file_write_error");});
if (pending->write(file)) if (pending->write(file))
{ {
set_write_error(thd, is_transactional); set_write_error(thd, is_transactional);
if (check_write_error(thd) && cache_data && if (check_write_error(thd) && cache_data &&
stmt_has_updated_non_trans_table(thd)) stmt_has_updated_non_trans_table(thd))
cache_data->set_incident(); cache_data->set_incident();
delete pending;
cache_data->set_pending(NULL);
DBUG_EXECUTE_IF("simulate_disk_full_at_flush_pending",
{DBUG_SET("-d,simulate_file_write_error");});
DBUG_RETURN(1); DBUG_RETURN(1);
} }