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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
parent a9eb272f91 cacea31687
commit c41c79650a
277 changed files with 2048 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sql/sql_lex.h
View File

@ -1743,8 +1743,8 @@ public:
These constructor and destructor serve for creation/destruction
of Query_tables_list instances which are used as backup storage.
*/
Query_tables_list() {}
~Query_tables_list() {}
Query_tables_list() = default;
~Query_tables_list() = default;
/* Initializes (or resets) Query_tables_list object for "real" use. */
void reset_query_tables_list(bool init);
@ -2402,13 +2402,9 @@ class Lex_input_stream
const char *str, const char *end, int sep);
my_charset_conv_wc_mb get_escape_func(THD *thd, my_wc_t sep) const;
public:
Lex_input_stream()
{
}
Lex_input_stream() = default;
~Lex_input_stream()
{
}
~Lex_input_stream() = default;
/**
Object initializer. Must be called before usage.
@ -2991,7 +2987,7 @@ public:
protected:
bool save_explain_data_intern(MEM_ROOT *mem_root, Explain_update *eu, bool is_analyze);
public:
virtual ~Update_plan() {}
virtual ~Update_plan() = default;
Update_plan(MEM_ROOT *mem_root_arg) :
impossible_where(false), no_partitions(false),
@ -3045,7 +3041,7 @@ enum password_exp_type
struct Account_options: public USER_RESOURCES
{
Account_options() { }
Account_options() = default;
void reset()
{
@ -4795,14 +4791,13 @@ class Set_signal_information
{
public:
/** Empty default constructor, use clear() */
Set_signal_information() {}
Set_signal_information() = default;
/** Copy constructor. */
Set_signal_information(const Set_signal_information& set);
/** Destructor. */
~Set_signal_information()
{}
~Set_signal_information() = default;
/** Clear all items. */
void clear();
@ -4925,8 +4920,7 @@ public:
return m_lip.init(thd, buff, length);
}
~Parser_state()
{}
~Parser_state() = default;
Lex_input_stream m_lip;
Yacc_state m_yacc;