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

4
sql/structs.h
View File

@ -855,7 +855,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;
@ -869,7 +869,7 @@ public:
class Timeval: public timeval
{
protected:
Timeval() { }
Timeval() = default;
public:
Timeval(my_time_t sec, ulong usec)
{