diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
| commit | 26c389b7b770a3699ec1fc81df7f379f6084c9e6 (patch) | |
| tree | 7f915e858b211834deeb52928dfdf5ab12b24bfe /sql/sp_head.cc | |
| parent | b9557418ccd9f484806515fba030757274e691f2 (diff) | |
| parent | fd08f953222b854428dc259631e8fc707fe34619 (diff) | |
| download | mariadb-git-26c389b7b770a3699ec1fc81df7f379f6084c9e6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 027892b8441..0179214e508 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -191,7 +191,7 @@ sp_get_flags_for_command(LEX *lex) switch (lex->sql_command) { case SQLCOM_SELECT: - if (lex->result) + if (lex->result && !lex->analyze_stmt) { flags= 0; /* This is a SELECT with INTO clause */ break; |