diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-01 12:39:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-01 12:39:59 +0100 |
| commit | 6a3fee211f0595e0adcdf058b36c4231035a4a53 (patch) | |
| tree | f6cfc1297bc6fb421b064d1b16e09ecdae74d21e /sql | |
| parent | b2ceedc9fb7c12159448cd7ad5db62e1226a2c43 (diff) | |
| parent | edf34f38ac4fad7996bf19cd9ac669d2a6825400 (diff) | |
| download | mariadb-git-6a3fee211f0595e0adcdf058b36c4231035a4a53.tar.gz | |
Merge remote-tracking branch 'refs/remotes/github/10.1' into 10.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 8 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index aa0cb4a92ef..c0b1b9947da 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -341,11 +341,13 @@ sp_get_flags_for_command(LEX *lex) case SQLCOM_DELETE_MULTI: { /* - DELETE normally doesn't return resultset, but there are two exceptions: + DELETE normally doesn't return resultset, but there are 3 exceptions: - DELETE ... RETURNING - EXPLAIN DELETE ... + - ANALYZE DELETE ... */ - if (lex->select_lex.item_list.is_empty() && !lex->describe) + if (lex->select_lex.item_list.is_empty() && + !lex->describe && !lex->analyze_stmt) flags= 0; else flags= sp_head::MULTI_RESULTS; @@ -358,7 +360,7 @@ sp_get_flags_for_command(LEX *lex) case SQLCOM_REPLACE_SELECT: case SQLCOM_INSERT_SELECT: { - if (!lex->describe) + if (!lex->describe && !lex->analyze_stmt) flags= 0; else flags= sp_head::MULTI_RESULTS; diff --git a/sql/sql_class.h b/sql/sql_class.h index e6457f23a50..16913fd50b5 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4116,7 +4116,7 @@ public: virtual bool check_simple_select() const { return FALSE; } void abort_result_set(); virtual void cleanup(); - bool is_result_interceptor() { return true; } + bool is_result_interceptor() { return false; } }; |