database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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

10
sql/sql_error.h
View File

@ -245,8 +245,7 @@ class Sql_condition_identity: public Sql_state_errno_level,
public Sql_user_condition_identity
{
public:
Sql_condition_identity()
{ }
Sql_condition_identity() = default;
Sql_condition_identity(const Sql_state_errno_level &st,
const Sql_user_condition_identity &ucid)
:Sql_state_errno_level(st),
@ -447,8 +446,7 @@ private:
}
/** Destructor. */
~Sql_condition()
{}
~Sql_condition() = default;
/**
Copy optional condition items attributes.
@ -863,8 +861,8 @@ public:
class ErrConv: public ErrBuff
{
public:
ErrConv() {}
virtual ~ErrConv() {}
ErrConv() = default;
virtual ~ErrConv() = default;
virtual const char *ptr() const = 0;
};