diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-19 13:16:25 +0100 |
| commit | fa3f8a18b247d5d7d86d60d016681cc188522f80 (patch) | |
| tree | 180232f5e13c81e22ae9374b41be168ed9578932 /sql/sql_base.h | |
| parent | efab095c7f8f044525ce7d2313fad5f86032baab (diff) | |
| parent | 543b6e02246db25d8a61574fc709b28e7720d1a0 (diff) | |
| download | mariadb-git-fa3f8a18b247d5d7d86d60d016681cc188522f80.tar.gz | |
mysql-5.5.34 merge
(some patches reverted, test case added)
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 110f2abbd1d..d49554d5473 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 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 @@ -543,7 +543,7 @@ public: }; Open_table_context(THD *thd, uint flags); - bool recover_from_failed_open(THD *thd); + bool recover_from_failed_open(); bool request_backoff_action(enum_open_table_action action_arg, TABLE_LIST *table); @@ -583,6 +583,8 @@ public: } private: + /* THD for which tables are opened. */ + THD *m_thd; /** For OT_DISCOVER and OT_REPAIR actions, the table list element for the table which definition should be re-discovered or which |