From 061f172c2da92551c0662306b7efed258bbbaea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Wed, 13 Mar 2013 09:19:58 +0100 Subject: [PATCH] Adjust mariadb-sortbuffer.patch to correspond with upstream patch --- mariadb-sortbuffer.patch | 34 +++++++++++++++------------------- mariadb.spec | 1 + 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/mariadb-sortbuffer.patch b/mariadb-sortbuffer.patch index be8bd04..5649d3b 100644 --- a/mariadb-sortbuffer.patch +++ b/mariadb-sortbuffer.patch @@ -1,19 +1,15 @@ -diff -up mariadb-5.5.29/storage/myisam/myisamchk.c.sortbuffer mariadb-5.5.29/storage/myisam/myisamchk.c ---- mariadb-5.5.29/storage/myisam/myisamchk.c.sortbuffer 2013-02-27 16:46:02.258855014 +0100 -+++ mariadb-5.5.29/storage/myisam/myisamchk.c 2013-02-27 16:46:23.456854430 +0100 -@@ -294,13 +294,13 @@ static struct my_option my_long_options[ - { "sort_buffer_size", OPT_SORT_BUFFER_SIZE, - "Deprecated. myisam_sort_buffer_size alias is being used", - &check_param.sort_buffer_length, -- &check_param.sort_buffer_length, 0, GET_ULL, REQUIRED_ARG, -+ &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG, - (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), - SIZE_T_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0}, - { "myisam_sort_buffer_size", OPT_SORT_BUFFER_SIZE, - "Alias of sort_buffer_size parameter", - &check_param.sort_buffer_length, -- &check_param.sort_buffer_length, 0, GET_ULL, REQUIRED_ARG, -+ &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG, - (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD), - SIZE_T_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0}, - { "sort_key_blocks", OPT_SORT_KEY_BLOCKS, "", +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]; diff --git a/mariadb.spec b/mariadb.spec index f00f2b0..7ad8455 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -791,6 +791,7 @@ fi %changelog * Wed Mar 13 2013 Honza Horak 5.5.29-9 - Let mariadb-embedded-devel conflict with MySQL-embedded-devel +- Adjust mariadb-sortbuffer.patch to correspond with upstream patch * Mon Mar 4 2013 Honza Horak 5.5.29-8 - Mask expected warnings about setrlimit in test suite