maria-developers team mailing list archive

Thread
Date

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2736)

To: maria-developers@xxxxxxxxxxxxxxxxxxx
From: knielsen@xxxxxxxxxxxxxxx
Date: Tue, 15 Sep 2009 13:55:40 +0200
User-agent: Bazaar (1.17)

#At lp:maria

 2736 knielsen@xxxxxxxxxxxxxxx	2009-09-15
      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.
      modified:
        configure.in
        sql/share/errmsg.txt

=== modified file 'configure.in'
--- a/configure.in	2009-09-07 20:50:10 +0000
+++ b/configure.in	2009-09-15 11:55:37 +0000
@@ -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

=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt	2009-09-07 20:50:10 +0000
+++ b/sql/share/errmsg.txt	2009-09-15 11:55:37 +0000
@@ -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��dres� datab� nebo �eln�v�echny"
-        dan "Filen '%-.128s' skal v� i database-folderen og kunne l�s af alle"
+        dan "Filen '%-.128s' skal v� i database-folderen, eller kunne l�s 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�[���ǂ߂����ɋ��‚������Ȃ����Ȃ�����