diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 19:39:59 +0200 |
| commit | fbab79c9b8a58b90292e900cf46ab6d6632ebb68 (patch) | |
| tree | 49738ad2561489954fa0973d82be10fafbf42e0b /sql/sql_explain.h | |
| parent | afbb72b3b6988f4c5242d46588754517724b2950 (diff) | |
| parent | aed2050e40cb332d54e8d40eb7242309b962c4e1 (diff) | |
| download | mariadb-git-fbab79c9b8a58b90292e900cf46ab6d6632ebb68.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
Diffstat (limited to 'sql/sql_explain.h')
| -rw-r--r-- | sql/sql_explain.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_explain.h b/sql/sql_explain.h index 154769fe289..fb524263a8e 100644 --- a/sql/sql_explain.h +++ b/sql/sql_explain.h @@ -286,6 +286,7 @@ public: class Explain_aggr_filesort : public Explain_aggr_node { List<Item> sort_items; + List<ORDER::enum_order> sort_directions; public: enum_explain_aggr_node_type get_type() { return AGGR_OP_FILESORT; } Filesort_tracker tracker; |