1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.11 into 11.0

This commit is contained in:
Marko Mäkelä
2023-02-16 13:34:45 +02:00
493 changed files with 7008 additions and 2592 deletions

View File

@@ -981,7 +981,7 @@ public:
class Load_data_outvar
{
public:
virtual ~Load_data_outvar() {}
virtual ~Load_data_outvar() = default;
virtual bool load_data_set_null(THD *thd, const Load_data_param *param)= 0;
virtual bool load_data_set_value(THD *thd, const char *pos, uint length,
const Load_data_param *param)= 0;
@@ -995,7 +995,7 @@ public:
class Timeval: public timeval
{
protected:
Timeval() { }
Timeval() = default;
public:
Timeval(my_time_t sec, ulong usec)
{