1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
277 changed files with 2048 additions and 1500 deletions

View File

@ -324,7 +324,7 @@ public:
/* See RANGE_OPT_PARAM::alloced_sel_args */
enum { MAX_SEL_ARGS = 16000 };
SEL_ARG() {}
SEL_ARG() = default;
SEL_ARG(SEL_ARG &);
SEL_ARG(Field *,const uchar *, const uchar *);
SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value,
@ -934,7 +934,7 @@ public:
uint used_key_parts;
QUICK_SELECT_I();
virtual ~QUICK_SELECT_I(){};
virtual ~QUICK_SELECT_I() = default;;
/*
Do post-constructor initialization.