summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--sql/share/errmsg.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 2c2d27136c0..4705d4a343a 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
#
# When merging new MySQL releases, update the version number to match the
# 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])
PROTOCOL_VERSION=10
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 5531ee71620..df0d7d97d2d 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -2044,7 +2044,7 @@ ER_BLOBS_AND_NO_TERMINATED 42000 S1009
ukr " BLOB. 'fields terminated by'"
ER_TEXTFILE_NOT_READABLE
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."
eng "The file '%-.128s' must be in the database directory or be readable by all"
jps "t@C '%-.128s' databse directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.",