summaryrefslogtreecommitdiff
path: root/sql/derror.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-08-02 11:05:29 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-08-02 11:05:29 +0200
commitef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6 (patch)
tree5c5c70ee11cdf4414a9cc9a5eacdae881933c70a /sql/derror.cc
parent5ec40fbb2704a0bf1369836d88a5def4721809c8 (diff)
parent09ec8e2e2246f9fb67fd41631c5669d9ae26b2e5 (diff)
downloadmariadb-git-ef7cb0a0b5108b74c23bf6190f7df2cbfe2996a6.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/derror.cc')
-rw-r--r--sql/derror.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/derror.cc b/sql/derror.cc
index d6ca47e9054..932c01b9dda 100644
--- a/sql/derror.cc
+++ b/sql/derror.cc
@@ -236,7 +236,7 @@ static File open_error_msg_file(const char *file_name, const char *language,
MYF(0))) < 0)
{
/*
- Trying pre-5.4 sematics of the --language parameter.
+ Trying pre-5.4 semantics of the --language parameter.
It included the language-specific part, e.g.:
--language=/path/to/english/
*/