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/sql_cte.h | |
| parent | cb1e44219b9beae92e104cfe5e67aab3073dd8aa (diff) | |
| parent | 4ca7b226c05ae883accec64b1afe6d60daf1b323 (diff) | |
| download | mariadb-git-2250e9ea261f661cb73c147a28f4d30655d7483d.tar.gz | |
Merge 10.2 into 10.2-mdev9864.
Diffstat (limited to 'sql/sql_cte.h')
| -rw-r--r-- | sql/sql_cte.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cte.h b/sql/sql_cte.h index 94fad561b0d..89223170261 100644 --- a/sql/sql_cte.h +++ b/sql/sql_cte.h @@ -66,7 +66,7 @@ private: LEX_STRING unparsed_spec; /* Return the map where 1 is set only in the position for this element */ - table_map get_elem_map() { return 1 << number; } + table_map get_elem_map() { return (table_map) 1 << number; } public: /* |