Rebase to 5.5.30

.gitignore

@@ -1,2 +1,3 @@
 /mariadb-5.5.28a.tar.gz
 /mariadb-5.5.29.tar.gz
+/mariadb-5.5.30.tar.gz

mariadb-buffer.patch

@@ -1,24 +0,0 @@
-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"

mariadb-sortbuffer.patch

@@ -1,15 +0,0 @@
-diff -up mariadb-5.5.29/include/myisamchk.h.buffer mariadb-5.5.29/include/myisamchk.h
---- mariadb-5.5.29/include/myisamchk.h.buffer	2013-03-13 09:17:02.802160975 +0100
-+++ mariadb-5.5.29/include/myisamchk.h	2013-03-13 09:17:37.383161267 +0100
-@@ -138,9 +138,9 @@ typedef struct st_handler_check_param
-   /* Following is used to check if rows are visible */
-   ulonglong max_trid, max_found_trid;
-   ulonglong not_visible_rows_found;
-+  ulonglong sort_buffer_length;
-   ulonglong use_buffers;                        /* Used as param to getopt() */
--  size_t read_buffer_length, write_buffer_length;
--  size_t sort_buffer_length, sort_key_blocks;
-+  size_t read_buffer_length, write_buffer_length, sort_key_blocks;
-   time_t backup_time;                           /* To sign backup files */
-   ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];
-   double new_rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY];

mariadb-warning.patch

@@ -1,11 +0,0 @@
-diff -up mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning mariadb-5.5.29/mysql-test/mysql-test-run.pl
---- mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning	2013-03-04 14:05:50.197960442 +0100
-+++ mariadb-5.5.29/mysql-test/mysql-test-run.pl	2013-03-04 14:06:27.271959422 +0100
-@@ -4745,6 +4745,7 @@ sub extract_warning_lines ($$) {
-      qr|Error: io_setup\(\) failed|,
-      qr|Warning: io_setup\(\) failed|,
-      qr|Warning: io_setup\(\) attempt|,
-+     qr|setrlimit could not change the size of core files to 'infinity';|,
-     );
- 
-   my $matched_lines= [];

mariadb.spec

@@ -1,6 +1,6 @@
 Name: mariadb
-Version: 5.5.29
+Version: 5.5.30
-Release: 11%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -51,10 +51,7 @@ Patch10: mariadb-file-contents.patch
 Patch11: mariadb-string-overflow.patch
 Patch12: mariadb-dh1024.patch
 Patch13: mariadb-man-plugin.patch
-Patch14: mariadb-buffer.patch
+Patch14: mariadb-basedir.patch
-Patch15: mariadb-sortbuffer.patch
-Patch16: mariadb-basedir.patch
-Patch17: mariadb-warning.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -250,9 +247,6 @@ MariaDB is a community developed branch of MySQL.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -748,6 +742,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Mar 22 2013 Honza Horak <hhorak@redhat.com> 5.5.30-1
+- Rebase to 5.5.30
+  https://kb.askmonty.org/en/mariadb-5530-changelog/
+
 * Fri Mar 22 2013 Honza Horak <hhorak@redhat.com> 1:5.5.29-11
 - Obsolete MySQL since it is now renamed to community-mysql
 - Remove real- virtual names

sources

@@ -1 +1 @@
-643cca7f07f7b00ca3ae1515e6f245d6  mariadb-5.5.29.tar.gz
+39d4da4dabc8bda012517b3587dee6f8  mariadb-5.5.30.tar.gz