database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

5.3 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-05-04 07:16:38 +02:00
parent 550d6871a5 d335b47191
commit 44cf9ee5f7
52 changed files with 850 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.h
View File

@@ -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
{