diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-04 15:31:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-04 15:31:25 +0400 |
| commit | 5c0df0e4a89b12813cef665533e852a50ecaafae (patch) | |
| tree | b75df302abedca56d679ef04a019fac3a5fc7dbc /sql/item_func.cc | |
| parent | 25ad623d64ebc34093544875e5b0ebd6101e975b (diff) | |
| parent | ad2d722acd7bd7a816dff7838f3fa2dcaaeec8da (diff) | |
| download | mariadb-git-5c0df0e4a89b12813cef665533e852a50ecaafae.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index c36f177223b..f56ede71b40 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -245,8 +245,9 @@ bool Item_func::check_argument_types_scalar(uint start, uint end) const is to allow all Item_field() objects to setup pointers to the table fields. Sets as a side effect the following class variables: - maybe_null Set if any argument may return NULL - with_sum_func Set if any of the arguments contains a sum function + maybe_null Set if any argument may return NULL + with_sum_func Set if any of the arguments contains a sum function + with_window_func Set if any of the arguments contain a window function with_field Set if any of the arguments contains or is a field used_tables_cache Set to union of the tables used by arguments @@ -3649,7 +3650,7 @@ longlong Item_master_gtid_wait::val_int() { DBUG_ASSERT(fixed == 1); longlong result= 0; - String *gtid_pos = args[0]->val_str(&value); + String *gtid_pos __attribute__((unused)) = args[0]->val_str(&value); if (args[0]->null_value) { |