diff options
author | unknown <monty@mashka.mysql.fi> | 2003-07-14 10:12:05 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-07-14 10:12:05 +0300 |
commit | e1a30696034b70e3bf78036aa75a6e8389ebb2c4 (patch) | |
tree | 85936c89d5a7b0f3d650ffa18d3d2990a7c252fa /sql/repl_failsafe.cc | |
parent | d1b9076e5102ffcffa86b488ecfcb26fd03b8884 (diff) | |
download | mariadb-git-e1a30696034b70e3bf78036aa75a6e8389ebb2c4.tar.gz |
Safety and speedup fixes:
Changed is_open() to work as before.
Added back inited argument to LOG
mysql-test/r/rpl_flush_log_loop.result:
Fixed results (probably bug in previous rpatch)
sql/handler.cc:
Changed is_open() to work as before
sql/item_func.cc:
Changed is_open() to work as before
sql/log.cc:
Part revert of previous patch.
The reason for adding back 'inited' is that is that we can't be 100 % sure that init_pthread_objects() is called before mysqld dies (for example on windows)
I removed mutex lock handling in is_open() as the new code didn't have ANY affect except beeing slower.
Added back checking of is_open() to some functions as we don't want to do a mutex lock when we are not using logging.
Indentation/comment fixes
sql/log_event.cc:
Changed is_open() to work as before
sql/repl_failsafe.cc:
Changed is_open() to work as before
sql/sql_base.cc:
Changed is_open() to work as before
sql/sql_class.h:
Changed is_open() to work as before. Added back 'inited' variable
sql/sql_db.cc:
Changed is_open() to work as before
sql/sql_delete.cc:
Changed is_open() to work as before
sql/sql_insert.cc:
Changed is_open() to work as before
sql/sql_load.cc:
Changed is_open() to work as before
sql/sql_parse.cc:
Changed is_open() to work as before
sql/sql_rename.cc:
Changed is_open() to work as before
sql/sql_repl.cc:
Changed is_open() to work as before
sql/sql_table.cc:
Changed is_open() to work as before
sql/sql_update.cc:
Changed is_open() to work as before
Diffstat (limited to 'sql/repl_failsafe.cc')
-rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 6f404d4b958..1552b3994e9 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -265,7 +265,7 @@ int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg) LINT_INIT(cmp_res); DBUG_ENTER("translate_master"); - if (!mysql_bin_log.is_open(1)) + if (!mysql_bin_log.is_open()) { strmov(errmsg,"Binary log is not open"); DBUG_RETURN(1); |