summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2016-02-17 14:30:25 -0800
committerIgor Babaev <igor@askmonty.org>2016-02-17 14:30:25 -0800
commitf340aaeb52916d028a41ed771dfbbdd9dc4c3f88 (patch)
treeb21ddfef1213a345019fa1835844ae44be420bc5 /sql/share
parent22f52f1f09b62534eea139a678c954507bb3e89e (diff)
downloadmariadb-git-f340aaeb52916d028a41ed771dfbbdd9dc4c3f88.tar.gz
Addressed the issues raised in the review for the main patchbb-10.2-mdev8789
of mdev-8789. Fixed a bug in TABLE_LIST::print. Fixed another bug for the case when the definition of a WITH table contained column list while the join in the main query used two instances of this table.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 42a461bf406..cb774e92aab 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7137,10 +7137,10 @@ ER_KILL_QUERY_DENIED_ERROR
ger "Sie sind nicht Eigentümer von Abfrage %lu"
rus "Вы не являетесь владельцем запроса %lu"
ER_WITH_COL_WRONG_LIST
- eng "With column list and SELECT field list have different column counts"
+ eng "WITH column list and SELECT field list have different column counts"
ER_DUP_QUERY_NAME
- eng "Duplicate query name in with clause"
+ eng "Duplicate query name in WITH clause"
ER_WRONG_ORDER_IN_WITH_CLAUSE
- eng "The definition of the table '%s' refers to the table '%s' defined later in a non-recursive with clause"
+ eng "The definition of the table '%s' refers to the table '%s' defined later in a non-recursive WITH clause"
ER_RECURSIVE_QUERY_IN_WITH_CLAUSE
- eng "Recursive queries in with clause are not supported yet"
+ eng "Recursive queries in WITH clause are not supported yet"