diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-03 09:41:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-03 09:41:50 +0200 |
| commit | ddbc6126920c1ad0300f7f9734348309f5073de7 (patch) | |
| tree | f98a56b0fef476345979f3a228de8ffd27da0ea6 /sql/sql_select.cc | |
| parent | 0f81ca6a0bb21fbba4bca93a7555f7c8e6357b47 (diff) | |
| parent | 676987c4a14069d415c56d0f259aaaa7ca742c23 (diff) | |
| download | mariadb-git-ddbc6126920c1ad0300f7f9734348309f5073de7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ce820946908..b83da48233d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4288,6 +4288,9 @@ mysql_select(THD *thd, } else { + if (thd->lex->describe) + select_options|= SELECT_DESCRIBE; + /* When in EXPLAIN, delay deleting the joins so that they are still available when we're producing EXPLAIN EXTENDED warning text. |