1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge bb-10.2-ext into 10.3

This commit is contained in:
Marko Mäkelä
2018-02-15 10:22:03 +02:00
583 changed files with 17039 additions and 5592 deletions

View File

@@ -207,6 +207,9 @@ public:
Explain_select(MEM_ROOT *root, bool is_analyze) :
Explain_basic_join(root),
#ifndef DBUG_OFF
select_lex(NULL),
#endif
linkage(UNSPECIFIED_TYPE),
message(NULL),
having(NULL), having_value(Item::COND_UNDEF),
@@ -218,6 +221,9 @@ public:
void add_linkage(Json_writer *writer);
public:
#ifndef DBUG_OFF
SELECT_LEX *select_lex;
#endif
const char *select_type;
enum sub_select_type linkage;