diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
commit | e9c1701e11e2441435223cc7c00c467f58aaff19 (patch) | |
tree | 6be7d0e8fe87272e1abb2704fdb9859481d8acc2 /sql/sp_head.cc | |
parent | 17794fb9aac9ca4fcb0b1e5904671a025a1b6b74 (diff) | |
parent | f3eb82f048d342c11fc3869eca2e6faed9a4835d (diff) | |
download | mariadb-git-e9c1701e11e2441435223cc7c00c467f58aaff19.tar.gz |
Merge 10.3 into 10.4
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 48bd8ac8221..dfbfde64029 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -147,7 +147,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; |