1 files changed, 46 insertions, 11 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index ec08885fda4..034f987e0e7 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -4620,7 +4620,7 @@ ER_USER_LIMIT_REACHED 42000
         swe "Anv�ndare '%-.64s' har �verskridit '%s' (nuvarande v�rde: %ld)"
 ER_SPECIFIC_ACCESS_DENIED_ERROR 42000 
         nla "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie"
-        eng "Access denied; you need the %-.128s privilege for this operation"
+        eng "Access denied; you need (at least one of) the %-.128s privilege(s) for this operation"
         ger "Kein Zugriff. Hierf�r wird die Berechtigung %-.128s ben�tigt"
         ita "Accesso non consentito. Serve il privilegio %-.128s per questa operazione"
         por "Acesso negado. Voc� precisa o privil�gio %-.128s para essa opera��o"
@@ -4702,7 +4702,7 @@ ER_NOT_SUPPORTED_YET 42000
         swe "Denna version av MySQL kan �nnu inte utf�ra '%s'"
 ER_MASTER_FATAL_ERROR_READING_BINLOG  
         nla "Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log"
-        eng "Got fatal error %d: '%-.128s' from master when reading data from binary log"
+        eng "Got fatal error %d from master when reading data from binary log: '%-.128s'"
         ger "Schwerer Fehler %d: '%-.128s vom Master beim Lesen des bin�ren Logs"
         ita "Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario"
         por "Obteve fatal erro %d: '%-.128s' do master quando lendo dados do binary log"
@@ -4879,13 +4879,7 @@ ER_ZLIB_Z_DATA_ERROR
         por "ZLIB: Dados de entrada est� corrupto"
         spa "ZLIB: Dato de entrada fu� corrompido para zlib"
 ER_CUT_VALUE_GROUP_CONCAT  
-        eng "%d line(s) were cut by GROUP_CONCAT()"
-        ger "%d Zeile(n) durch GROUP_CONCAT() abgeschnitten"
-        nla "%d regel(s) door GROUP_CONCAT() ingekort"
-        por "%d linha(s) foram cortada(s) por GROUP_CONCAT()"
-        spa "%d l�nea(s) fue(fueron) cortadas por group_concat()"
-        swe "%d rad(er) kapades av group_concat()"
-        ukr "%d line(s) was(were) cut by group_concat()"
+        eng "Row %u was cut by GROUP_CONCAT()"
 ER_WARN_TOO_FEW_RECORDS 01000 
         eng "Row %ld doesn't contain data for all columns"
         ger "Zeile %ld enth�lt nicht f�r alle Felder Daten"
@@ -6206,8 +6200,49 @@ ER_TOO_MANY_CONCURRENT_TRXS
 
 WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
   eng "Non-ASCII separator arguments are not fully supported"
+
+ER_DEBUG_SYNC_TIMEOUT
+  eng "debug sync point wait timed out"
+  ger "Debug Sync Point Wartezeit �berschritten"
+ER_DEBUG_SYNC_HIT_LIMIT
+  eng "debug sync point hit limit reached"
+  ger "Debug Sync Point Hit Limit erreicht"
+
+ER_DUP_SIGNAL_SET 42000
+        eng "Duplicate condition information item '%s'"
+
+# Note that the SQLSTATE is not 01000, it is provided by SIGNAL/RESIGNAL
+ER_SIGNAL_WARN 01000
+        eng "Unhandled user-defined warning condition"
+
+# Note that the SQLSTATE is not 02000, it is provided by SIGNAL/RESIGNAL
+ER_SIGNAL_NOT_FOUND 02000
+        eng "Unhandled user-defined not found condition"
+
+# Note that the SQLSTATE is not HY000, it is provided by SIGNAL/RESIGNAL
+ER_SIGNAL_EXCEPTION HY000
+        eng "Unhandled user-defined exception condition"
+
+ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER 0K000
+        eng "RESIGNAL when handler not active"
+
+ER_SIGNAL_BAD_CONDITION_TYPE
+        eng "SIGNAL/RESIGNAL can only use a CONDITION defined with SQLSTATE"
+
+WARN_COND_ITEM_TRUNCATED
+        eng "Data truncated for condition item '%s'"
+
+ER_COND_ITEM_TOO_LONG
+        eng "Data too long for condition item '%s'"
+
+ER_UNKNOWN_LOCALE                                                                                                                                                                    
+        eng "Unknown locale: '%-.64s'"
+
+ER_SLAVE_IGNORE_SERVER_IDS
+  eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
+
 ER_SAME_NAME_PARTITION_FIELD
-        eng "Duplicate partition field name '%-.192s'"
+  eng "Duplicate partition field name '%-.192s'"
 ER_PARTITION_COLUMN_LIST_ERROR
   eng "Inconsistency in usage of column lists for partitioning"
 ER_WRONG_TYPE_COLUMN_VALUE_ERROR
@@ -6219,7 +6254,7 @@ ER_MAXVALUE_IN_VALUES_IN
 ER_TOO_MANY_VALUES_ERROR
   eng "Cannot have more than one value for this type of %-.64s partitioning"
 ER_ROW_SINGLE_PARTITION_FIELD_ERROR
-        eng "Row expressions in VALUES IN only allowed for multi-field column partitioning"
+  eng "Row expressions in VALUES IN only allowed for multi-field column partitioning"
 ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD
   eng "Field '%-.192s' is of a not allowed type for this type of partitioning"
 ER_PARTITION_FIELDS_TOO_LONG