diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 12:38:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-21 12:38:25 +0300 |
| commit | d3e4fae797b9467828c33c89b55a991067e8bcde (patch) | |
| tree | 6cf809a7c4d4a41e04c204a1393162d0a4eec59e /sql/item_cmpfunc.cc | |
| parent | 690ae1de45943b549ca792862d6de03fdfb5f923 (diff) | |
| parent | e46f76c9749d7758765ba274a212cfc2dcf3eeb8 (diff) | |
| download | mariadb-git-d3e4fae797b9467828c33c89b55a991067e8bcde.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 687aa7e192b..6cf8b985486 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB + Copyright (c) 2009, 2021, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1383,6 +1383,9 @@ bool Item_in_optimizer::fix_fields(THD *thd, Item **ref) maybe_null=1; m_with_subquery= true; join_with_sum_func(args[1]); + with_window_func= args[0]->with_window_func; + // The subquery cannot have window functions aggregated in this select + DBUG_ASSERT(!args[1]->with_window_func); with_field= with_field || args[1]->with_field; with_param= args[0]->with_param || args[1]->with_param; used_tables_and_const_cache_join(args[1]); |