1 files changed, 16 insertions, 11 deletions

diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 9263ee89400..2495c2676be 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -79,7 +79,7 @@ character-set=koi8u
 "Первинного ключа визначено неодноразово",
 "Забагато ключ╕в зазначено. Дозволено не б╕льше %d ключ╕в",
 "Забагато частин ключа зазначено. Дозволено не б╕льше %d частин",
-"Зазначений ключ задовгий. Найб╕льша довжина ключа %d",
+"Зазначений ключ задовгий. Найб╕льша довжина ключа %d байт╕в",
 "Ключовий стовбець '%-.64s' не ╕сну╓ у таблиц╕",
 "BLOB стовбець '%-.64s' не може бути використаний у визначенн╕ ключа в цьому тип╕ таблиц╕",
 "Задовга довжина стовбця '%-.64s' (max = %d). Використайте тип BLOB",
@@ -152,7 +152,7 @@ character-set=koi8u
 "Повноважень не визначено для користувача '%-.32s' з хосту '%-.64s'",
 "%-.16s команда заборонена користувачу: '%-.32s'@'%-.64s' у таблиц╕ '%-.64s'",
 "%-.16s команда заборонена користувачу: '%-.32s'@'%-.64s' для стовбця '%-.64s' у таблиц╕ '%-.64s'",
-"Хибна GRANT/REVOKE команда. Прочитайте документац╕ю стосовно того, як╕ права можна використовувати.",
+"Хибна GRANT/REVOKE команда; прочитайте документац╕ю стосовно того, як╕ права можна використовувати",
 "Аргумент host або user для GRANT задовгий",
 "Таблиця '%-.64s.%-.64s' не ╕сну╓",
 "Повноважень не визначено для користувача '%-.32s' з хосту '%-.64s' для таблиц╕ '%-.64s'",
@@ -209,7 +209,7 @@ character-set=koi8u
 "Операц╕я не може бути виконана з запущеним п╕длеглим, спочатку виконайте STOP SLAVE",
 "Операц╕я вимага╓ запущеного п╕длеглого, зконф╕гуруйте п╕длеглого та виконайте START SLAVE",
 "Сервер не зконф╕гуровано як п╕длеглий, виправте це у файл╕ конф╕гурац╕╖ або з CHANGE MASTER TO",
-"Не можу ╕н╕ц╕ал╕зувати структуру информац╕╖ головного, перев╕рте права доступу на master.info",
+"Could not initialize master info structure, more error messages can be found in the MySQL error log",
 "Не можу створити п╕длеглу г╕лку, перев╕рте системн╕ ресурси",
 "Користувач %-.64s вже ма╓ б╕льше н╕ж 'max_user_connections' активних з'╓днань",
 "Можна використовувати лише вирази з╕ сталими у SET",
@@ -236,7 +236,7 @@ character-set=koi8u
 "Option '%s' used twice in statement",
 "User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
 "Access denied. You need the %-.128s privilege for this operation",
-"Variable '%-.64s' is a LOCAL variable and can't be used with SET GLOBAL",
+"Variable '%-.64s' is a SESSION variable and can't be used with SET GLOBAL",
 "Variable '%-.64s' is a GLOBAL variable and should be set with SET GLOBAL",
 "Variable '%-.64s' doesn't have a default value",
 "Variable '%-.64s' can't be set to the value of '%-.64s'",
@@ -246,6 +246,7 @@ character-set=koi8u
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
 "Slave SQL thread ignored the query because of replicate-*-table rules",
+"Variable '%-.64s' is a %s variable",
 "Wrong foreign key definition for '%-.64s': %s",
 "Key reference and table reference doesn't match",
 "Операнд ма╓ складатися з %d стовбц╕в",
@@ -269,7 +270,7 @@ character-set=koi8u
 "Z_DATA_ERROR: Input data was corrupted for zlib",
 "%d line(s) was(were) cut by group_concat()",
 "Row %ld doesn't contain data for all columns",
-"Row %ld was truncated; It contained more data than there where input columns",
+"Row %ld was truncated; It contained more data than there were input columns",
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld",
 "Data truncated, out of range for column '%s' at row %ld",
 "Data truncated for column '%s' at row %ld",
@@ -281,8 +282,8 @@ character-set=koi8u
 "Illegal mix of collations for operation '%s'",
 "Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
 "Unknown collation: '%-.64s'",
-"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started.",
-"Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later when MySQL slave with SSL will be started",
+"Server is running in --secure-auth mode, but '%s'@'%s' has a password in the old format; please change the password to the new format",
 "Стовбець або посилання '%-.64s%s%-.64s%s%-.64s' ╕з SELECTу #%d було знайдене у SELECT╕ #%d",
 "Wrong parameter or combination of parameters for START SLAVE UNTIL",
 "It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart",
@@ -294,10 +295,14 @@ character-set=koi8u
 "Unknown key cache '%-.100s'",
 "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",
 "Unknown table engine '%s'",
-"'%s' is deprecated. Use '%s' instead.",
-"Таблиця %-.100s у %s не може оновлюватись.",
-"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
-"MySQL is started in --skip-grant-tables mode. You can't use this command"
+"'%s' is deprecated, use '%s' instead",
+"Таблиця %-.100s у %s не може оновлюватись",
+"The '%s' feature was disabled; you need MySQL built with '%s' to have it working",
+"The MySQL server is running with the %s option so it cannot execute this statement",
+"Column '%-.100s' has duplicated value '%-.64s' in %s"
+"Truncated wrong %-.32s value: '%-.128s'"
+"Incorrect table definition; There can only be one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+"Invalid ON UPDATE clause for '%-.64s' field",
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"