diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-19 16:56:13 +0300 |
| commit | 3a7201ea922f6d3373924c413fdb4b108f6208c5 (patch) | |
| tree | 1dd4316340daba50d6d1f684c7137b47c7799541 /sql/item_windowfunc.cc | |
| parent | 578d8bfde53c42245f2a0641e7cc2af2ed8230cc (diff) | |
| parent | c73fa2d75fac7a057ae817bfaf142adb87ff2500 (diff) | |
| download | mariadb-git-3a7201ea922f6d3373924c413fdb4b108f6208c5.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_windowfunc.cc')
| -rw-r--r-- | sql/item_windowfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_windowfunc.cc b/sql/item_windowfunc.cc index 6ab903a81bb..a216930cad6 100644 --- a/sql/item_windowfunc.cc +++ b/sql/item_windowfunc.cc @@ -71,7 +71,7 @@ Item_window_func::fix_fields(THD *thd, Item **ref) { DBUG_ASSERT(fixed == 0); - enum_parsing_place place= thd->lex->current_select->parsing_place; + enum_parsing_place place= thd->lex->current_select->context_analysis_place; if (!(place == SELECT_LIST || place == IN_ORDER_BY)) { |