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

Merge 10.6 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 13:43:53 +02:00
parent 29cd17e8d9 6aec87544c
commit dbab3e8d90
299 changed files with 2528 additions and 1655 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),
@@ -450,8 +449,7 @@ private:
}
/** Destructor. */
~Sql_condition()
{}
~Sql_condition() = default;
/**
Copy optional condition items attributes.
@@ -871,8 +869,8 @@ public:
class ErrConv: public ErrBuff
{
public:
ErrConv() {}
virtual ~ErrConv() {}
ErrConv() = default;
virtual ~ErrConv() = default;
virtual LEX_CSTRING lex_cstring() const= 0;
inline const char *ptr() const
{