Commit 85c97f96 authored by unknown's avatar unknown

More after-merge fixes for MySQL 5.1.38 merge.

Fix version number (we are based on 5.1.38, not 5.1.39).
Fix mistaken translation in error message.
parent 7fd10246
...@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM ...@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
# #
# When merging new MySQL releases, update the version number to match the # When merging new MySQL releases, update the version number to match the
# MySQL version number, but reset the maria subrelease (-beta1). # MySQL version number, but reset the maria subrelease (-beta1).
AM_INIT_AUTOMAKE(mysql, 5.1.39-maria-beta1) AM_INIT_AUTOMAKE(mysql, 5.1.38-maria-beta1)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
...@@ -2044,7 +2044,7 @@ ER_BLOBS_AND_NO_TERMINATED 42000 S1009 ...@@ -2044,7 +2044,7 @@ ER_BLOBS_AND_NO_TERMINATED 42000 S1009
ukr " BLOB. 'fields terminated by'" ukr " BLOB. 'fields terminated by'"
ER_TEXTFILE_NOT_READABLE ER_TEXTFILE_NOT_READABLE
cze "Soubor '%-.128s' mus-B bt v adresi databze nebo iteln pro vechny" cze "Soubor '%-.128s' mus-B bt v adresi databze nebo iteln pro vechny"
dan "Filen '%-.128s' skal vre i database-folderen og kunne lses af alle" dan "Filen '%-.128s' skal vre i database-folderen, eller kunne lses af alle"
nla "Het bestand '%-.128s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn." nla "Het bestand '%-.128s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."
eng "The file '%-.128s' must be in the database directory or be readable by all" eng "The file '%-.128s' must be in the database directory or be readable by all"
jps "t@C '%-.128s' databse directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.", jps "t@C '%-.128s' databse directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment