diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-15 22:50:54 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-15 22:50:54 -0800 |
| commit | e16535ce1957567b1f176bdbcda766a8104a5072 (patch) | |
| tree | b4415fcad59a4372a3c783cb0b7acfcdf86ffef5 /sql/item.h | |
| parent | 32e027ead7d65976dfcfaa95b7fa325a73783701 (diff) | |
| download | mariadb-git-e16535ce1957567b1f176bdbcda766a8104a5072.tar.gz | |
olap.result, olap.test:
Added a test case for bug #8616.
item.h:
Fixed bug #8616.
Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
Fixed bug #8616.
Added JOIN::rollup_write_data to cover rollup queries
with DISTINCT. Modified other rollup methods.
sql/sql_select.cc:
Fixed bug #8616.
Added JOIN::rollup_write_data to cover rollup queries
with DISTINCT. Modified other rollup methods.
sql/sql_select.h:
Fixed bug #8616.
Added JOIN::rollup_write_data to cover rollup queries
with DISTINCT. Modified other rollup methods.
sql/item.h:
Fixed bug #8616.
Added class Item_null_result used in rollup processing.
mysql-test/t/olap.test:
Added a test case for bug #8616.
mysql-test/r/olap.result:
Added a test case for bug #8616.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index adc780677e1..e34a5f889d2 100644 --- a/sql/item.h +++ b/sql/item.h @@ -470,6 +470,17 @@ public: Item *safe_charset_converter(CHARSET_INFO *tocs); }; +class Item_null_result :public Item_null +{ +public: + Field *result_field; + Item_null_result() : Item_null(), result_field(0) {} + bool is_result_field() { return result_field != 0; } + void save_in_result_field(bool no_conversions) + { + save_in_field(result_field, no_conversions); + } +}; /* Item represents one placeholder ('?') of prepared statement */ |