diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-05-19 12:36:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-05-19 12:36:58 +0400 |
| commit | 49b29e35b2099fcbc3342814fc0ce9c17ba1bdeb (patch) | |
| tree | e830a8a54e6640c3e30d171f4ad6e37f347e146d /sql/share | |
| parent | 3ea05d08427dc3d679fef838e9334685f556cc32 (diff) | |
| parent | 810b7f8ecbea0fbf52e03aa710a8059ea301f7dc (diff) | |
| download | mariadb-git-49b29e35b2099fcbc3342814fc0ce9c17ba1bdeb.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 250da9948a0..02ba889aaa4 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7961,3 +7961,5 @@ ER_KEY_CONTAINS_PERIOD_FIELDS eng "Key %`s cannot explicitly include column %`s" ER_KEY_CANT_HAVE_WITHOUT_OVERLAPS eng "Key %`s cannot have WITHOUT OVERLAPS" +ER_NOT_ALLOWED_IN_THIS_CONTEXT + eng "'%-.128s' is not allowed in this context" |