diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
| commit | 7f1900705b28a432a91595726f7d58e6d968cbd5 (patch) | |
| tree | a24724ebc45941490e2970d87c495bc5f5cbb64b /sql/share | |
| parent | 375caf99c494a4add7d48d5db3a3ec4b409a256e (diff) | |
| parent | b54aeeb080aba2385204cdd09cba3eedbbf1b891 (diff) | |
| download | mariadb-git-7f1900705b28a432a91595726f7d58e6d968cbd5.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 0e93f0546c9..32f1a25e126 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -1801,8 +1801,8 @@ ER_WRONG_AUTO_KEY 42000 S1009 spa "Puede ser solamente un campo automatico y este debe ser definido como una clave" swe "Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel" ukr "Невірне визначення таблиці; Може бути лише один автоматичний стовбець, що повинен бути визначений як ключ" -ER_UNUSED_9 - eng "You should never see it" +ER_BINLOG_CANT_DELETE_GTID_DOMAIN + eng "Could not delete gtid domain. Reason: %s." ER_NORMAL_SHUTDOWN cze "%s (%s): normální ukončení\n" dan "%s (%s): Normal nedlukning\n" @@ -7330,7 +7330,7 @@ ER_SUBQUERIES_NOT_SUPPORTED 42000 eng "%s does not support subqueries or stored functions" ER_SET_STATEMENT_NOT_SUPPORTED 42000 eng "The system variable %.200s cannot be set in SET STATEMENT." -ER_UNUSED_17 +ER_UNUSED_9 eng "You should never see it" ER_USER_CREATE_EXISTS eng "Can't create user '%-.64s'@'%-.64s'; it already exists" |