[mariadb] Fix format for buffer size in error messages (MDEV-4156)

Honza Horak hhorak at fedoraproject.org
Mon Feb 11 16:32:22 UTC 2013


commit e3d7534ed7d03096b764327557b4e231cb15a581
Author: Honza Horák <hhorak at redhat.com>
Date:   Mon Feb 11 10:08:58 2013 +0100

    Fix format for buffer size in error messages (MDEV-4156)

 mariadb-buffer.patch |   24 ++++++++++++++++++++++++
 mariadb.spec         |    3 +++
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/mariadb-buffer.patch b/mariadb-buffer.patch
new file mode 100644
index 0000000..cec4397
--- /dev/null
+++ b/mariadb-buffer.patch
@@ -0,0 +1,24 @@
+diff -up mariadb-5.5.29/sql/share/errmsg-utf8.txt.buffer mariadb-5.5.29/sql/share/errmsg-utf8.txt
+--- mariadb-5.5.29/sql/share/errmsg-utf8.txt.buffer	2013-02-11 10:04:42.099376733 +0100
++++ mariadb-5.5.29/sql/share/errmsg-utf8.txt	2013-02-11 10:06:09.450370760 +0100
+@@ -4989,13 +4989,13 @@ ER_WRONG_NAME_FOR_CATALOG 42000
+         spa "Nombre de catalog incorrecto '%-.100s'"
+         swe "Felaktigt katalog namn '%-.100s'"
+ ER_WARN_QC_RESIZE  
+-        eng "Query cache failed to set size %lu; new query cache size is %lu"
+-        ger "Änderung der Query-Cache-Größe auf %lu fehlgeschlagen; neue Query-Cache-Größe ist %lu"
+-        por "Falha em Query cache para configurar tamanho %lu, novo tamanho de query cache é %lu"
+-        rus "Кеш запросов не может установить размер %lu, новый размер кеша зпросов - %lu"
+-        spa "Query cache fallada para configurar tamaño %lu, nuevo tamaño de query cache es %lu"
+-        swe "Storleken av "Query cache" kunde inte sättas till %lu, ny storlek är %lu"
+-        ukr "Кеш запитів неспроможен встановити розмір %lu, новий розмір кеша запитів - %lu"
++        eng "Query cache failed to set size %llu; new query cache size is %lu"
++        ger "Änderung der Query-Cache-Größe auf %llu fehlgeschlagen; neue Query-Cache-Größe ist %lu"
++        por "Falha em Query cache para configurar tamanho %llu, novo tamanho de query cache é %lu"
++        rus "Кеш запросов не может установить размер %llu, новый размер кеша зпросов - %lu"
++        spa "Query cache fallada para configurar tamaño %llu, nuevo tamaño de query cache es %lu"
++        swe "Storleken av "Query cache" kunde inte sättas till %llu, ny storlek är %lu"
++        ukr "Кеш запитів неспроможен встановити розмір %llu, новий розмір кеша запитів - %lu"
+ ER_BAD_FT_COLUMN  
+         eng "Column '%-.192s' cannot be part of FULLTEXT index"
+         ger "Feld '%-.192s' kann nicht Teil eines FULLTEXT-Index sein"
diff --git a/mariadb.spec b/mariadb.spec
index 50e4728..ab55f74 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -52,6 +52,7 @@ Patch10: mariadb-file-contents.patch
 Patch11: mariadb-string-overflow.patch
 Patch12: mariadb-dh1024.patch
 Patch13: mariadb-man-plugin.patch
+Patch14: mariadb-buffer.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -285,6 +286,7 @@ MariaDB is a community developed branch of MySQL.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -780,6 +782,7 @@ fi
 - Packages need to provide also %%_isa version of mysql package
 - Provide own symbols with real- prefix to distinguish from mysql
   unambiguously
+- Fix format for buffer size in error messages (MDEV-4156)
 
 * Tue Feb 05 2013 Honza Horak <hhorak at redhat.com> 5.5.29-2
 - Let mariadb-libs to own /etc/my.cnf.d


More information about the scm-commits mailing list