diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 11:40:39 +0200 |
| commit | cefc30b1663114930439e03dec245604bc904604 (patch) | |
| tree | 83a4479fe38adb24e478dde743856f04d65fa801 /sql/log.h | |
| parent | 34f2f8ea41726d98e50752ff3453ebde70912c35 (diff) | |
| parent | 171355077501da7ddd32778ab3ebe77c5f7ce7da (diff) | |
| download | mariadb-git-cefc30b1663114930439e03dec245604bc904604.tar.gz | |
merge with MySQL 5.1.65
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h index 361ad0f2a91..f42ef514307 100644 --- a/sql/log.h +++ b/sql/log.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2010, Oracle and/or its affiliates. + Copyright (c) 2005, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -130,6 +130,11 @@ extern TC_LOG_DUMMY tc_log_dummy; class Relay_log_info; +/* + Note that we destroy the lock mutex in the desctructor here. + This means that object instances cannot be destroyed/go out of scope, + until we have reset thd->current_linfo to NULL; + */ typedef struct st_log_info { char log_file_name[FN_REFLEN]; @@ -289,8 +294,8 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG int new_file_impl(bool need_lock); public: - MYSQL_LOG::generate_name; - MYSQL_LOG::is_open; + using MYSQL_LOG::generate_name; + using MYSQL_LOG::is_open; /* This is relay log */ bool is_relay_log; |