Merge branch '10.2' into 10.2-mdev9864

This commit is contained in:
Galina Shalygina 2016-05-25 00:34:13 +03:00
commit 6c6c3af6aa
112 changed files with 2344 additions and 2193 deletions

View file

@ -5218,6 +5218,8 @@ ER_VIEW_SELECT_DERIVED
ger "SELECT der View enthält eine Subquery in der FROM-Klausel"
rus "View SELECT содержит подзапрос в конструкции FROM"
ukr "View SELECT має підзапит у конструкції FROM"
# Not used any more, syntax error is returned instead
ER_VIEW_SELECT_CLAUSE
eng "View's SELECT contains a '%s' clause"
ger "SELECT der View enthält eine '%s'-Klausel"