database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 11.2 into 11.3

Browse Source
This commit is contained in:
Marko Mäkelä
2023-10-27 10:48:29 +03:00
parent c4a506f0bf d0f8dfbcf0
commit 7b842f1536
511 changed files with 15169 additions and 29021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_base.h
View File

@@ -131,6 +131,9 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update,
*/
#define MYSQL_OPEN_IGNORE_LOGGING_FORMAT 0x20000
/* Don't use statistics tables */
#define MYSQL_OPEN_IGNORE_ENGINE_STATS 0x40000
/** Please refer to the internals manual. */
#define MYSQL_OPEN_REOPEN (MYSQL_OPEN_IGNORE_FLUSH |\
MYSQL_OPEN_IGNORE_GLOBAL_READ_LOCK |\
@@ -665,7 +668,7 @@ class No_such_table_error_handler : public Internal_error_handler
{
public:
No_such_table_error_handler()
: m_handled_errors(0), m_unhandled_errors(0)
: m_handled_errors(0), m_unhandled_errors(0), first_error(0)
{}
bool handle_condition(THD *thd,
@@ -680,11 +683,11 @@ public:
trapped and no other errors have been seen. FALSE otherwise.
*/
bool safely_trapped_errors();
uint got_error() { return first_error; }
private:
int m_handled_errors;
int m_unhandled_errors;
uint first_error;
};
#endif /* SQL_BASE_INCLUDED */