diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
| commit | 2250e9ea261f661cb73c147a28f4d30655d7483d (patch) | |
| tree | 04673b47943fdb137f8fe5bafdb64a24887f8c0f /sql/item_windowfunc.h | |
| parent | cb1e44219b9beae92e104cfe5e67aab3073dd8aa (diff) | |
| parent | 4ca7b226c05ae883accec64b1afe6d60daf1b323 (diff) | |
| download | mariadb-git-2250e9ea261f661cb73c147a28f4d30655d7483d.tar.gz | |
Merge 10.2 into 10.2-mdev9864.
Diffstat (limited to 'sql/item_windowfunc.h')
| -rw-r--r-- | sql/item_windowfunc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h index 40f48cc7dc5..9d2fa135e29 100644 --- a/sql/item_windowfunc.h +++ b/sql/item_windowfunc.h @@ -117,7 +117,7 @@ public: } const char*func_name() const { - return "row_number"; + return "row_number("; } }; @@ -433,7 +433,7 @@ class Item_sum_ntile : public Item_sum_window_with_row_count double val_real() { - return val_int(); + return (double) val_int(); } longlong val_int() @@ -534,7 +534,7 @@ public: have been computed. In that case, window function will need to read its temp.table field. In order to allow that, mark that field in the read_set. */ - bool register_field_in_read_map(uchar *arg) + bool register_field_in_read_map(void *arg) { TABLE *table= (TABLE*) arg; if (result_field && (result_field->table == table || !table)) |