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 | 852e2b0f0d7d7ef9d1e97df3863afe9b80096663 (patch) | |
tree | 85936c89d5a7b0f3d650ffa18d3d2990a7c252fa /sql/sql_update.cc | |
parent | 78f1ee24f4a7c864dc084fd69f04592f27ea60de (diff) | |
download | mariadb-git-852e2b0f0d7d7ef9d1e97df3863afe9b80096663.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/sql_update.cc')
-rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 42ba00d3ad5..3179c8e0f24 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -317,7 +317,7 @@ int mysql_update(THD *thd, if (updated && (error <= 0 || !transactional_table)) { mysql_update_log.write(thd,thd->query,thd->query_length); - if (mysql_bin_log.is_open(1)) + if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); @@ -933,7 +933,7 @@ bool multi_update::send_eof() if (updated && (local_error <= 0 || !trans_safe)) { mysql_update_log.write(thd,thd->query,thd->query_length); - if (mysql_bin_log.is_open(1)) + if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, thd->query, thd->query_length, log_delayed); |