diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-24 18:48:40 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-24 18:48:40 +0400 |
| commit | ab96710bb7c236a74ad912c791173f48d3832c5c (patch) | |
| tree | b9b3c85ec9a3d487bac51907d29a9f19fd95c16d /sql/sql_prepare.cc | |
| parent | af22a70df98a79804e8fa34d8f0af58deee162a3 (diff) | |
| parent | 48c59f394bb9bd4dfd34be19ff4cf933557eb017 (diff) | |
| download | mariadb-git-ab96710bb7c236a74ad912c791173f48d3832c5c.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index e99cf15f447..6ab777f7eac 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1591,7 +1591,7 @@ static int mysql_test_select(Prepared_statement *stmt, */ if (unit->prepare(thd, 0, 0)) goto error; - if (!lex->describe && !stmt->is_sql_prepare()) + if (!lex->describe && !thd->lex->analyze_stmt && !stmt->is_sql_prepare()) { /* Make copy of item list, as change_columns may change it */ List<Item> fields(lex->select_lex.item_list); |