summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2016-03-23 16:09:58 -0700
committerIgor Babaev <igor@askmonty.org>2016-03-23 16:09:58 -0700
commit82cb35be11c566e4675bd14393cfa7157a280b93 (patch)
tree4f00940bf5523bf749d3b372ee0286de6143abb4 /sql/share
parenta74e8d36dde934b72b230b6d50b89f8e1ec034ae (diff)
downloadmariadb-git-82cb35be11c566e4675bd14393cfa7157a280b93.tar.gz
Changed the base class for Item_window_func from Item_result_field to
Item_func_or_sum. Implemented method update_used_tables for class Item_findow_func. Added the flag Item::with_window_func. Made sure that window functions could be used only in SELECT list and ORDER BY clause. Added test cases that checked different illegal placements of window functions.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 9e868fcafdf..062854d8cea 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7148,6 +7148,10 @@ ER_WINDOW_FRAME_IN_REFERENCED_WINDOW_SPEC
eng "Referenced window specification '%s' cannot contain window frame"
ER_BAD_COMBINATION_OF_WINDOW_FRAME_BOUND_SPECS
eng "Unacceptable combination of window frame bound specifications"
+ER_WRONG_PLACEMENT_OF_WINDOW_FUNCTION
+ eng "Window function is allowed only in SELECT list and ORDER BY clause"
+ER_WINDOW_FUNCTION_IN_WINDOW_SPEC
+ eng "Window function is not allowed in window specification"
ER_NOT_ALLOWED_WINDOW_FRAME
eng "Window frame is not allowed with '%s'"
ER_NO_ORDER_LIST_IN_WINDOW_SPEC