diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-04 07:16:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-04 07:16:38 +0200 |
| commit | 44cf9ee5f7acd2148dc32f4eee4519a087c52b93 (patch) | |
| tree | 5b67e89f11e9cdac90d6cc13655e61a55400addd /sql/sql_select.h | |
| parent | 550d6871a5eb93013435055e11a4fe3009490c82 (diff) | |
| parent | d335b471918b4ab0bca05984a70669653cf3169f (diff) | |
| download | mariadb-git-44cf9ee5f7acd2148dc32f4eee4519a087c52b93.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 53f2356853e..08ddc27e204 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -36,7 +36,7 @@ #if defined(WITH_ARIA_STORAGE_ENGINE) -#include "../storage/maria/ha_maria.h" +#include <maria.h> #endif #if defined(USE_ARIA_FOR_TMP_TABLES) #define TMP_ENGINE_HTON maria_hton @@ -1319,6 +1319,7 @@ public: return (do_send_rows && implicit_grouping && !group_optimized_away && having_value != Item::COND_FALSE); } + bool empty_result() { return (zero_result_cause && !implicit_grouping); } bool change_result(select_result *result); bool is_top_level_join() const { |