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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2018-02-08 19:06:25 +04:00
parent 560b9895d4 5c057b3fef
commit 3cad31f2a7
522 changed files with 11092 additions and 4684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_explain.h
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;