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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2021-02-01 13:49:33 +01:00
parent 59eda73eff ff5186fd2b
commit 60ea09eae6
261 changed files with 20978 additions and 2998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_class.h
View File

@ -3291,7 +3291,7 @@ public:
void update_all_stats();
void update_stats(void);
void change_user(void);
void cleanup(bool have_mutex=false);
void cleanup(void);
void cleanup_after_query();
void free_connection();
void reset_for_reuse();
@ -6576,6 +6576,22 @@ class Sql_mode_save
sql_mode_t old_mode; // SQL mode saved at construction time.
};
class Abort_on_warning_instant_set
{
THD *m_thd;
bool m_save_abort_on_warning;
public:
Abort_on_warning_instant_set(THD *thd, bool temporary_value)
:m_thd(thd), m_save_abort_on_warning(thd->abort_on_warning)
{
thd->abort_on_warning= temporary_value;
}
~Abort_on_warning_instant_set()
{
m_thd->abort_on_warning= m_save_abort_on_warning;
}
};
class Switch_to_definer_security_ctx
{
public: