database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-11-23 00:50:54 +01:00
parent 2c032b990e eea310e498
commit c6d30805db
1275 changed files with 80717 additions and 55003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_base.h
View File

@ -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
@ -581,7 +581,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);
@ -621,6 +621,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