diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2013-03-28 14:18:51 +0530 |
|---|---|---|
| committer | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2013-03-28 14:18:51 +0530 |
| commit | 9a1d651b0e905c5bd3bbb2d8bb68a95511a9a979 (patch) | |
| tree | 924361342b42d301d8cdc1a60c902782b44c7961 /sql | |
| parent | af0e25725e69ad5a2671bb54db2e85dfa1dd770f (diff) | |
| parent | d054027c4bfabdfa1cdbb58ee9aa34557eacbb45 (diff) | |
| download | mariadb-git-9a1d651b0e905c5bd3bbb2d8bb68a95511a9a979.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 4db1893b1cb..d2682a3eb9e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -9393,6 +9393,8 @@ Write_rows_log_event::do_exec_row(const Relay_log_info *const rli) #ifdef MYSQL_CLIENT void Write_rows_log_event::print(FILE *file, PRINT_EVENT_INFO* print_event_info) { + DBUG_EXECUTE_IF("simulate_cache_read_error", + {DBUG_SET("+d,simulate_my_b_fill_error");}); Rows_log_event::print_helper(file, print_event_info, "Write_rows"); } #endif diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 0eb6142090c..0ccabfe74e7 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -2004,6 +2004,8 @@ bool show_binlogs(THD* thd) if (protocol->write()) goto err; } + if(index_file->error == -1) + goto err; mysql_bin_log.unlock_index(); my_eof(thd); DBUG_RETURN(FALSE); |