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 10.8 into 10.9

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-16 10:25:34 +02:00
parent 37a46e2181 b12cd88ce1
commit 0d55914d96
327 changed files with 2896 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/table.h
View File

@@ -137,14 +137,13 @@ public:
void restore_env(THD *thd, Object_creation_ctx *backup_ctx);
protected:
Object_creation_ctx() {}
Object_creation_ctx() = default;
virtual Object_creation_ctx *create_backup_ctx(THD *thd) const = 0;
virtual void change_env(THD *thd) const = 0;
public:
virtual ~Object_creation_ctx()
{ }
virtual ~Object_creation_ctx() = default;
};
/*************************************************************************/
@@ -551,7 +550,7 @@ protected:
public:
Table_check_intact(bool keys= false) : has_keys(keys) {}
virtual ~Table_check_intact() {}
virtual ~Table_check_intact() = default;
/** Checks whether a table is intact. */
bool check(TABLE *table, const TABLE_FIELD_DEF *table_def);
@@ -728,7 +727,7 @@ public:
struct TABLE_SHARE
{
TABLE_SHARE() {} /* Remove gcc warning */
TABLE_SHARE() = default; /* Remove gcc warning */
/** Category of this table. */
TABLE_CATEGORY table_category;
@@ -1277,7 +1276,7 @@ struct vers_select_conds_t;
struct TABLE
{
TABLE() {} /* Remove gcc warning */
TABLE() = default; /* Remove gcc warning */
TABLE_SHARE *s;
handler *file;
@@ -2223,7 +2222,7 @@ class Index_hint;
struct TABLE_CHAIN
{
TABLE_CHAIN() {}
TABLE_CHAIN() = default;
TABLE_LIST **start_pos;
TABLE_LIST ** end_pos;
@@ -2234,7 +2233,7 @@ struct TABLE_CHAIN
struct TABLE_LIST
{
TABLE_LIST() {} /* Remove gcc warning */
TABLE_LIST() = default; /* Remove gcc warning */
enum prelocking_types
{
@@ -3006,8 +3005,8 @@ class Item;
class Field_iterator: public Sql_alloc
{
public:
Field_iterator() {} /* Remove gcc warning */
virtual ~Field_iterator() {}
Field_iterator() = default; /* Remove gcc warning */
virtual ~Field_iterator() = default;
virtual void set(TABLE_LIST *)= 0;
virtual void next()= 0;
virtual bool end_of_fields()= 0; /* Return 1 at end of list */
@@ -3068,7 +3067,7 @@ class Field_iterator_natural_join: public Field_iterator
Natural_join_column *cur_column_ref;
public:
Field_iterator_natural_join() :cur_column_ref(NULL) {}
~Field_iterator_natural_join() {}
~Field_iterator_natural_join() = default;
void set(TABLE_LIST *table);
void next();
bool end_of_fields() { return !cur_column_ref; }