diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
| commit | f72a7659976089dc6f727bb31e8a91306199cf57 (patch) | |
| tree | 0199cd1bf1c16b01b358ab88e5dce5b038349872 /sql/log.cc | |
| parent | ed06ba3492d55c9e9dde231b55352f854e5e4b50 (diff) | |
| parent | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (diff) | |
| download | mariadb-git-f72a7659976089dc6f727bb31e8a91306199cf57.tar.gz | |
5.2 merge.
two tests still fail:
main.innodb_icp and main.range_vs_index_merge_innodb
call records_in_range() with both range ends being open
(which triggers an assert)
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 7c25de96365..c28357c3f78 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2490,7 +2490,10 @@ bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time, { end= strxmov(buff, "# administrator command: ", NullS); buff_len= (ulong) (end - buff); - my_b_write(&log_file, (uchar*) buff, buff_len); + DBUG_EXECUTE_IF("simulate_slow_log_write_error", + {DBUG_SET("+d,simulate_file_write_error");}); + if(my_b_write(&log_file, (uchar*) buff, buff_len)) + tmp_errno= errno; } if (my_b_write(&log_file, (uchar*) sql_text, sql_text_len) || my_b_write(&log_file, (uchar*) ";\n",2) || |