Commit fd8d108c authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged
parents 16f0c9f6 bac1c946
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ ER_DUP_KEYNAME 42000 S1009
        swe "Nyckelnamn '%-.64s' finns flera gnger"
        ukr " '  '%-.64s'"
ER_DUP_ENTRY 23000 S1009
	cze "Zvojen-B kl '%-.64s' (slo kle %d)"
	cze "Zdvojen-B kl '%-.64s' (slo kle %d)"
	dan "Ens vrdier '%-.64s' for indeks %d"
	nla "Dubbele ingang '%-.64s' voor zoeksleutel %d"
	eng "Duplicate entry '%-.64s' for key %d"