mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
647c619393
when generating new name.
If find_uniq_filename returns an error, then this error is not
being propagated upwards, and execution does not report error to
the user (although a entry in the error log is generated).
Additionally, some more errors were ignored in new_file_impl:
- when writing the rotate event
- when reopening the index and binary log file
This patch addresses this by propagating the error up in the
execution stack. Furthermore, when rotation of the binary log
fails, an incident event is written, because there may be a
chance that some changes for a given statement, were not properly
logged. For example, in SBR, LOAD DATA INFILE statement requires
more than one event to be logged, should rotation fail while
logging part of the LOAD DATA events, then the logged data would
become inconsistent with the data in the storage engine.
mysql-test/include/restart_mysqld.inc:
Refactored restart_mysqld so that it is not hardcoded for
mysqld.1, but rather for the current server.
mysql-test/suite/binlog/t/binlog_index.test:
The error on open of index and binary log on new_file_impl
is now caught. Thence the user will get an error message.
We need to accomodate this change in the test case for the
failing FLUSH LOGS.
mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt:
Sets max_binlog_size to 4096.
mysql-test/suite/rpl/t/rpl_binlog_errors.test:
Added some test cases for asserting that the error is found
and reported.
sql/handler.cc:
Catching error now returned by unlog (in ha_commit_trans) and
returning it.
sql/log.cc:
Propagating errors from new_file_impl upwards. The errors that
new_file_impl catches now are:
- error on generate_new_name
- error on writing the rotate event
- error when opening the index or the binary log file.
sql/log.h:
Changing declaration of:
- rotate_and_purge
- new_file
- new_file_without_locking
- new_file_impl
- unlog
They now return int instead of void.
sql/mysql_priv.h:
Change signature of reload_acl_and_cache so that write_to_binlog
is an int instead of bool.
sql/mysqld.cc:
Redeclaring not_used var as int instead of bool.
sql/rpl_injector.cc:
Changes to catch the return from rotate_and_purge.
sql/slave.cc:
Changes to catch the return values for new_file and rotate_relay_log.
sql/slave.h:
Changes to rotate_relay_log declaration (now returns int
instead of void).
sql/sql_load.cc:
In SBR, some logging of LOAD DATA events goes through
IO_CACHE_CALLBACK invocation at mf_iocache.c:_my_b_get. The
IO_CACHE implementation is ignoring the return value for from
these callbacks (pre_read and post_read), so we need to find out
at the end of the execution if the error is set or not in THD.
sql/sql_parse.cc:
Catching the rotate_relay_log and rotate_and_purge return values.
Semantic change in reload_acl_and_cache so that we report errors
in binlog interactions through the write_to_binlog output parameter.
If there was any failure while rotating the binary log, we should
then report the error to the client when handling SQLCOMM_FLUSH.
|
||
|---|---|---|
| .. | ||
| binlog_auto_increment_bug33029-master.opt | ||
| binlog_auto_increment_bug33029.test | ||
| binlog_base64_flag.test | ||
| binlog_database.test | ||
| binlog_delete_and_flush_index.test | ||
| binlog_grant.test | ||
| binlog_incident-master.opt | ||
| binlog_incident.test | ||
| binlog_index-master.opt | ||
| binlog_index.test | ||
| binlog_innodb.test | ||
| binlog_innodb_row.test | ||
| binlog_killed.test | ||
| binlog_killed_simulate-master.opt | ||
| binlog_killed_simulate.test | ||
| binlog_mix_innodb_stat.test | ||
| binlog_mixed_failure_mixing_engines.test | ||
| binlog_mixed_load_data.test | ||
| binlog_multi_engine.test | ||
| binlog_old_versions.test | ||
| binlog_row_binlog-master.opt | ||
| binlog_row_binlog.test | ||
| binlog_row_ctype_cp932.test | ||
| binlog_row_ctype_ucs.test | ||
| binlog_row_drop_tmp_tbl.test | ||
| binlog_row_failure_mixing_engines.test | ||
| binlog_row_innodb_stat-master.opt | ||
| binlog_row_innodb_stat.test | ||
| binlog_row_insert_select.test | ||
| binlog_row_mix_innodb_myisam-master.opt | ||
| binlog_row_mix_innodb_myisam.test | ||
| binlog_row_mysqlbinlog_db_filter.test | ||
| binlog_row_mysqlbinlog_verbose.test | ||
| binlog_sql_mode.test | ||
| binlog_start_comment.test | ||
| binlog_statement_insert_delayed.test | ||
| binlog_stm_binlog-master.opt | ||
| binlog_stm_binlog.test | ||
| binlog_stm_blackhole.test | ||
| binlog_stm_ctype_cp932.test | ||
| binlog_stm_ctype_ucs.test | ||
| binlog_stm_do_db-master.opt | ||
| binlog_stm_do_db.test | ||
| binlog_stm_drop_tmp_tbl.test | ||
| binlog_stm_innodb_stat-master.opt | ||
| binlog_stm_innodb_stat.test | ||
| binlog_stm_insert_select.test | ||
| binlog_stm_mix_innodb_myisam-master.opt | ||
| binlog_stm_mix_innodb_myisam.test | ||
| binlog_stm_ps.test | ||
| binlog_stm_row.test | ||
| binlog_stm_unsafe_warning-master.opt | ||
| binlog_stm_unsafe_warning.test | ||
| binlog_tmp_table.test | ||
| binlog_truncate_innodb-master.opt | ||
| binlog_truncate_innodb.test | ||
| binlog_truncate_myisam.test | ||
| binlog_unsafe.test | ||
| binlog_write_error.test | ||
| disabled.def | ||