From f7802f9b05122ed91777a8c74c85603bea4c37ac Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 31 Oct 2019 15:47:00 -0500 Subject: [PATCH] Rebase to 10.3.18 --- mariadb-spider_on_armv7hl.patch | 113 +++++++++++++++----------------- mariadb.spec | 7 +- sources | 2 +- 3 files changed, 58 insertions(+), 64 deletions(-) diff --git a/mariadb-spider_on_armv7hl.patch b/mariadb-spider_on_armv7hl.patch index 2278481..e4e6694 100644 --- a/mariadb-spider_on_armv7hl.patch +++ b/mariadb-spider_on_armv7hl.patch @@ -1,16 +1,16 @@ Fix for: https://jira.mariadb.org/browse/MDEV-18737 Taken from: -https://github.com/MariaDB/server/commit/80f9bd3d9c4f1b6367487a88e4ca816fcb8ce186 +https://github.com/MariaDB/server/commit/ddce85907611e0533d6226de7f53e751cf173f6a -From 80f9bd3d9c4f1b6367487a88e4ca816fcb8ce186 Mon Sep 17 00:00:00 2001 -From: Kentoku -Date: Tue, 18 Jun 2019 01:43:07 +0900 -Subject: [PATCH] MDEV-18737 Spider "Out of memory" on armv7hl +From 3faf5d4c1c3274a20a92cb3eb7eb2de6140894d6 Mon Sep 17 00:00:00 2001 +From: Kentoku SHIBA +Date: Thu, 25 Jul 2019 22:52:45 +0900 +Subject: [PATCH] MDEV-18737 Spider "Out of memory" on armv7hl (#1363) This is an issue of memory alignment of variable argument when calling my_multi_malloc(). The fix is strictly casting allocating size to "uint". @@ -20,20 +20,20 @@ The fix is strictly casting allocating size to "uint". storage/spider/spd_copy_tables.cc | 25 ++-- storage/spider/spd_db_conn.cc | 13 +- storage/spider/spd_db_handlersocket.cc | 4 +- - storage/spider/spd_db_mysql.cc | 12 +- + storage/spider/spd_db_mysql.cc | 10 +- storage/spider/spd_db_oracle.cc | 24 ++-- storage/spider/spd_direct_sql.cc | 78 +++++------ storage/spider/spd_group_by_handler.cc | 7 +- storage/spider/spd_ping_table.cc | 36 +++-- storage/spider/spd_table.cc | 134 ++++++++++--------- storage/spider/spd_trx.cc | 173 +++++++++++++------------ - 12 files changed, 328 insertions(+), 283 deletions(-) + 12 files changed, 327 insertions(+), 282 deletions(-) diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc -index 33e81201fff..d3bc24dc0e0 100644 +index 967d2c6e5de..e04f0c8ef55 100644 --- a/storage/spider/ha_spider.cc +++ b/storage/spider/ha_spider.cc -@@ -395,15 +395,24 @@ int ha_spider::open( +@@ -394,15 +394,24 @@ int ha_spider::open( { if (!(searched_bitmap = (uchar *) spider_bulk_malloc(spider_current_trx, 15, MYF(MY_WME), @@ -67,7 +67,7 @@ index 33e81201fff..d3bc24dc0e0 100644 NullS)) ) { error_num = HA_ERR_OUT_OF_MEM; -@@ -11389,7 +11398,7 @@ int ha_spider::create( +@@ -11317,7 +11326,7 @@ int ha_spider::create( if (!(tmp_share.static_key_cardinality = (longlong *) spider_bulk_malloc(spider_current_trx, 246, MYF(MY_WME), &tmp_share.static_key_cardinality, @@ -76,7 +76,7 @@ index 33e81201fff..d3bc24dc0e0 100644 NullS)) ) { error_num = HA_ERR_OUT_OF_MEM; -@@ -12198,7 +12207,8 @@ int ha_spider::info_push( +@@ -12126,7 +12135,8 @@ int ha_spider::info_push( spider_free(spider_current_trx, hs_pushed_ret_fields, MYF(0)); if (!(hs_pushed_ret_fields = (uint32 *) spider_bulk_malloc(spider_current_trx, 17, MYF(MY_WME), @@ -86,7 +86,7 @@ index 33e81201fff..d3bc24dc0e0 100644 NullS)) ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); -@@ -13762,8 +13772,8 @@ SPIDER_BULK_ACCESS_LINK *ha_spider::create_bulk_access_link() +@@ -13690,8 +13700,8 @@ SPIDER_BULK_ACCESS_LINK *ha_spider::create_bulk_access_link() */ if (!(bulk_access_link = (SPIDER_BULK_ACCESS_LINK *) spider_bulk_malloc(spider_current_trx, 168, MYF(MY_WME), @@ -98,10 +98,10 @@ index 33e81201fff..d3bc24dc0e0 100644 ) { goto error_bulk_malloc; diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc -index b1f49f4f250..2f372d8f692 100644 +index 911c9bc95ac..f8ca9108061 100644 --- a/storage/spider/spd_conn.cc +++ b/storage/spider/spd_conn.cc -@@ -472,30 +472,30 @@ SPIDER_CONN *spider_create_conn( +@@ -470,30 +470,30 @@ SPIDER_CONN *spider_create_conn( #endif if (!(conn = (SPIDER_CONN *) spider_bulk_malloc(spider_current_trx, 18, MYF(MY_WME | MY_ZEROFILL), @@ -147,7 +147,7 @@ index b1f49f4f250..2f372d8f692 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -594,13 +594,13 @@ SPIDER_CONN *spider_create_conn( +@@ -592,13 +592,13 @@ SPIDER_CONN *spider_create_conn( } else if (conn_kind == SPIDER_CONN_KIND_HS_READ) { if (!(conn = (SPIDER_CONN *) spider_bulk_malloc(spider_current_trx, 19, MYF(MY_WME | MY_ZEROFILL), @@ -167,7 +167,7 @@ index b1f49f4f250..2f372d8f692 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -636,13 +636,13 @@ SPIDER_CONN *spider_create_conn( +@@ -634,13 +634,13 @@ SPIDER_CONN *spider_create_conn( } else { if (!(conn = (SPIDER_CONN *) spider_bulk_malloc(spider_current_trx, 20, MYF(MY_WME | MY_ZEROFILL), @@ -187,7 +187,7 @@ index b1f49f4f250..2f372d8f692 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -3648,13 +3648,16 @@ int spider_create_mon_threads( +@@ -3634,13 +3634,16 @@ int spider_create_mon_threads( } if (!(share->bg_mon_thds = (THD **) spider_bulk_malloc(spider_current_trx, 23, MYF(MY_WME | MY_ZEROFILL), @@ -263,10 +263,10 @@ index 13c53220b16..1a472e2c12b 100644 ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc -index f3d607cd6dc..6d3a88a55db 100644 +index cc4599ce0b3..f7178293b05 100644 --- a/storage/spider/spd_db_conn.cc +++ b/storage/spider/spd_db_conn.cc -@@ -2683,7 +2683,8 @@ int spider_db_fetch_for_item_sum_func( +@@ -2643,7 +2643,8 @@ int spider_db_fetch_for_item_sum_func( if (!spider->direct_aggregate_item_first) { if (!spider_bulk_malloc(spider_current_trx, 240, MYF(MY_WME), @@ -276,7 +276,7 @@ index f3d607cd6dc..6d3a88a55db 100644 NullS) ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); -@@ -2702,7 +2703,7 @@ int spider_db_fetch_for_item_sum_func( +@@ -2662,7 +2663,7 @@ int spider_db_fetch_for_item_sum_func( { if (!spider_bulk_malloc(spider_current_trx, 241, MYF(MY_WME), &spider->direct_aggregate_item_current->next, @@ -285,7 +285,7 @@ index f3d607cd6dc..6d3a88a55db 100644 ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); } -@@ -4074,8 +4075,8 @@ int spider_db_store_result( +@@ -4034,8 +4035,8 @@ int spider_db_store_result( current->field_count = field_count; if (!(position = (SPIDER_POSITION *) spider_bulk_malloc(spider_current_trx, 7, MYF(MY_WME | MY_ZEROFILL), @@ -296,7 +296,7 @@ index f3d607cd6dc..6d3a88a55db 100644 NullS)) ) DBUG_RETURN(HA_ERR_OUT_OF_MEM); -@@ -10948,8 +10949,8 @@ int spider_db_udf_copy_tables( +@@ -10814,8 +10815,8 @@ int spider_db_udf_copy_tables( DBUG_ENTER("spider_db_udf_copy_tables"); if (!(last_row_pos = (ulong *) spider_bulk_malloc(spider_current_trx, 30, MYF(MY_WME), @@ -308,7 +308,7 @@ index f3d607cd6dc..6d3a88a55db 100644 ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); diff --git a/storage/spider/spd_db_handlersocket.cc b/storage/spider/spd_db_handlersocket.cc -index ac81525092b..27257ee08e6 100644 +index 1e42838f40a..1e88ad4a59a 100644 --- a/storage/spider/spd_db_handlersocket.cc +++ b/storage/spider/spd_db_handlersocket.cc @@ -505,8 +505,8 @@ SPIDER_DB_ROW *spider_db_handlersocket_row::clone() @@ -323,10 +323,10 @@ index ac81525092b..27257ee08e6 100644 ) { delete clone_row; diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc -index 58351195a61..da2052ad79e 100644 +index 1b62b4a9bd5..947a614f11e 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc -@@ -537,9 +537,9 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone() +@@ -523,9 +523,9 @@ SPIDER_DB_ROW *spider_db_mbase_row::clone() row_size = record_size + field_count; } if (!spider_bulk_malloc(spider_current_trx, 29, MYF(MY_WME), @@ -339,16 +339,7 @@ index 58351195a61..da2052ad79e 100644 NullS) ) { delete clone_row; -@@ -5473,7 +5473,7 @@ int spider_db_mbase_util::append_tables_top_down( - int error_num; - uint outer_join_backup; - TABLE_LIST *cur_table_list, *prev_table_list = NULL, *cond_table_list = NULL; -- bool first; -+ bool first = TRUE; - DBUG_ENTER("spider_db_mbase_util::append_tables_top_down"); - DBUG_PRINT("info",("spider this=%p", this)); - if ( -@@ -13786,7 +13786,7 @@ int spider_mbase_handler::init_union_table_name_pos() +@@ -13519,7 +13519,7 @@ int spider_mbase_handler::init_union_table_name_pos() if (!union_table_name_pos_first) { if (!spider_bulk_malloc(spider_current_trx, 236, MYF(MY_WME), @@ -357,7 +348,7 @@ index 58351195a61..da2052ad79e 100644 NullS) ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); -@@ -13807,7 +13807,7 @@ int spider_mbase_handler::set_union_table_name_pos() +@@ -13540,7 +13540,7 @@ int spider_mbase_handler::set_union_table_name_pos() if (!union_table_name_pos_current->next) { if (!spider_bulk_malloc(spider_current_trx, 237, MYF(MY_WME), @@ -367,7 +358,7 @@ index 58351195a61..da2052ad79e 100644 ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc -index 773c6b90ed9..0c74415f6b2 100644 +index 08d7d3e083d..d869afc61f4 100644 --- a/storage/spider/spd_db_oracle.cc +++ b/storage/spider/spd_db_oracle.cc @@ -588,16 +588,16 @@ int spider_db_oracle_row::init() @@ -397,7 +388,7 @@ index 773c6b90ed9..0c74415f6b2 100644 NullS) ) || !(val_str = new spider_string[field_count]) -@@ -12519,7 +12519,7 @@ int spider_oracle_handler::init_union_table_name_pos() +@@ -12487,7 +12487,7 @@ int spider_oracle_handler::init_union_table_name_pos() if (!union_table_name_pos_first) { if (!spider_bulk_malloc(spider_current_trx, 238, MYF(MY_WME), @@ -406,7 +397,7 @@ index 773c6b90ed9..0c74415f6b2 100644 NullS) ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); -@@ -12540,7 +12540,7 @@ int spider_oracle_handler::set_union_table_name_pos() +@@ -12508,7 +12508,7 @@ int spider_oracle_handler::set_union_table_name_pos() if (!union_table_name_pos_current->next) { if (!spider_bulk_malloc(spider_current_trx, 239, MYF(MY_WME), @@ -624,10 +615,10 @@ index 431d46063c3..60e36fc24fb 100644 ) { my_error(HA_ERR_OUT_OF_MEM, MYF(0)); diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc -index 723beb0775e..fe628f55d16 100644 +index 83c5a37555f..5bae895570d 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc -@@ -1211,8 +1211,8 @@ int spider_create_string_list( +@@ -1209,8 +1209,8 @@ int spider_create_string_list( if (!(*string_list = (char**) spider_bulk_malloc(spider_current_trx, 37, MYF(MY_WME | MY_ZEROFILL), @@ -638,7 +629,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1330,7 +1330,7 @@ int spider_create_long_list( +@@ -1328,7 +1328,7 @@ int spider_create_long_list( if (!(*long_list = (long*) spider_bulk_malloc(spider_current_trx, 38, MYF(MY_WME | MY_ZEROFILL), @@ -647,7 +638,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1414,7 +1414,7 @@ int spider_create_longlong_list( +@@ -1412,7 +1412,7 @@ int spider_create_longlong_list( if (!(*longlong_list = (longlong *) spider_bulk_malloc(spider_current_trx, 39, MYF(MY_WME | MY_ZEROFILL), @@ -656,7 +647,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1485,8 +1485,8 @@ int spider_increase_string_list( +@@ -1483,8 +1483,8 @@ int spider_increase_string_list( if (!(tmp_str_list = (char**) spider_bulk_malloc(spider_current_trx, 40, MYF(MY_WME | MY_ZEROFILL), @@ -667,7 +658,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1548,8 +1548,8 @@ int spider_increase_null_string_list( +@@ -1546,8 +1546,8 @@ int spider_increase_null_string_list( if (!(tmp_str_list = (char**) spider_bulk_malloc(spider_current_trx, 247, MYF(MY_WME | MY_ZEROFILL), @@ -678,7 +669,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1606,7 +1606,7 @@ int spider_increase_long_list( +@@ -1604,7 +1604,7 @@ int spider_increase_long_list( if (!(tmp_long_list = (long*) spider_bulk_malloc(spider_current_trx, 41, MYF(MY_WME | MY_ZEROFILL), @@ -687,7 +678,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -1651,7 +1651,7 @@ int spider_increase_longlong_list( +@@ -1649,7 +1649,7 @@ int spider_increase_longlong_list( if (!(tmp_longlong_list = (longlong*) spider_bulk_malloc(spider_current_trx, 42, MYF(MY_WME | MY_ZEROFILL), @@ -696,7 +687,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { my_error(ER_OUT_OF_RESOURCES, MYF(0), HA_ERR_OUT_OF_MEM); -@@ -2974,17 +2974,17 @@ int spider_parse_connect_info( +@@ -2972,17 +2972,17 @@ int spider_parse_connect_info( if (!(share_alter->tmp_server_names = (char **) spider_bulk_malloc(spider_current_trx, 43, MYF(MY_WME | MY_ZEROFILL), &share_alter->tmp_server_names, @@ -720,7 +711,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { error_num = HA_ERR_OUT_OF_MEM; -@@ -4388,13 +4388,17 @@ SPIDER_SHARE *spider_create_share( +@@ -4383,13 +4383,17 @@ SPIDER_SHARE *spider_create_share( bitmap_size = spider_bitmap_size(table_share->fields); if (!(share = (SPIDER_SHARE *) spider_bulk_malloc(spider_current_trx, 46, MYF(MY_WME | MY_ZEROFILL), @@ -745,7 +736,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -5921,8 +5925,8 @@ SPIDER_LGTM_TBLHND_SHARE *spider_get_lgtm_tblhnd_share( +@@ -5907,8 +5911,8 @@ SPIDER_LGTM_TBLHND_SHARE *spider_get_lgtm_tblhnd_share( DBUG_PRINT("info",("spider create new lgtm tblhnd share")); if (!(lgtm_tblhnd_share = (SPIDER_LGTM_TBLHND_SHARE *) spider_bulk_malloc(spider_current_trx, 244, MYF(MY_WME | MY_ZEROFILL), @@ -756,7 +747,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -6031,9 +6035,10 @@ SPIDER_PARTITION_SHARE *spider_get_pt_share( +@@ -6017,9 +6021,10 @@ SPIDER_PARTITION_SHARE *spider_get_pt_share( DBUG_PRINT("info",("spider create new pt share")); if (!(partition_share = (SPIDER_PARTITION_SHARE *) spider_bulk_malloc(spider_current_trx, 51, MYF(MY_WME | MY_ZEROFILL), @@ -770,7 +761,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { *error_num = HA_ERR_OUT_OF_MEM; -@@ -6379,15 +6384,18 @@ int spider_open_all_tables( +@@ -6395,15 +6400,18 @@ int spider_open_all_tables( if (!(share = (SPIDER_SHARE *) spider_bulk_malloc(spider_current_trx, 52, MYF(MY_WME | MY_ZEROFILL), @@ -798,7 +789,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { delete spider; -@@ -7194,12 +7202,12 @@ int spider_db_init( +@@ -7204,12 +7212,12 @@ int spider_db_init( if (!(spider_udf_table_mon_mutexes = (pthread_mutex_t *) spider_bulk_malloc(NULL, 53, MYF(MY_WME | MY_ZEROFILL), @@ -817,7 +808,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) goto error_alloc_mon_mutxes; -@@ -7248,10 +7256,10 @@ int spider_db_init( +@@ -7258,10 +7266,10 @@ int spider_db_init( #ifndef WITHOUT_SPIDER_BG_SEARCH if (!(spider_table_sts_threads = (SPIDER_THREAD *) spider_bulk_malloc(NULL, 256, MYF(MY_WME | MY_ZEROFILL), @@ -832,7 +823,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) goto error_alloc_mon_mutxes; -@@ -7947,8 +7955,8 @@ SPIDER_INIT_ERROR_TABLE *spider_get_init_error_table( +@@ -7968,8 +7976,8 @@ SPIDER_INIT_ERROR_TABLE *spider_get_init_error_table( } if (!(spider_init_error_table = (SPIDER_INIT_ERROR_TABLE *) spider_bulk_malloc(spider_current_trx, 54, MYF(MY_WME | MY_ZEROFILL), @@ -843,7 +834,7 @@ index 723beb0775e..fe628f55d16 100644 NullS)) ) { pthread_mutex_unlock(&spider_init_error_tbl_mutex); -@@ -9624,25 +9632,25 @@ int spider_create_spider_object_for_share( +@@ -9551,25 +9559,25 @@ int spider_create_spider_object_for_share( #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET) if (!(need_mons = (int *) spider_bulk_malloc(spider_current_trx, 255, MYF(MY_WME | MY_ZEROFILL), @@ -884,10 +875,10 @@ index 723beb0775e..fe628f55d16 100644 ) #endif diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc -index 485c61fc60b..b1b31a6db2e 100644 +index bb9f11793cb..1638533eca1 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc -@@ -549,81 +549,90 @@ int spider_create_trx_alter_table( +@@ -548,81 +548,90 @@ int spider_create_trx_alter_table( if (!(alter_table = (SPIDER_ALTER_TABLE *) spider_bulk_malloc(spider_current_trx, 55, MYF(MY_WME | MY_ZEROFILL), @@ -1052,7 +1043,7 @@ index 485c61fc60b..b1b31a6db2e 100644 NullS)) ) { error_num = HA_ERR_OUT_OF_MEM; -@@ -1201,10 +1210,10 @@ SPIDER_TRX *spider_get_trx( +@@ -1200,10 +1209,10 @@ SPIDER_TRX *spider_get_trx( DBUG_PRINT("info",("spider create new trx")); if (!(trx = (SPIDER_TRX *) spider_bulk_malloc(NULL, 56, MYF(MY_WME | MY_ZEROFILL), @@ -1067,7 +1058,7 @@ index 485c61fc60b..b1b31a6db2e 100644 NullS)) ) goto error_alloc_trx; -@@ -4203,10 +4212,10 @@ int spider_create_trx_ha( +@@ -4191,10 +4200,10 @@ int spider_create_trx_ha( { if (!(trx_ha = (SPIDER_TRX_HA *) spider_bulk_malloc(spider_current_trx, 58, MYF(MY_WME), @@ -1083,5 +1074,5 @@ index 485c61fc60b..b1b31a6db2e 100644 ) { DBUG_RETURN(HA_ERR_OUT_OF_MEM); -- -2.17.2 +2.23.0 diff --git a/mariadb.spec b/mariadb.spec index 192ca5f..b5edf2e 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -152,8 +152,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.3.17 -Release: 3%{?with_debug:.debug}%{?dist} +Version: 10.3.18 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -1579,6 +1579,9 @@ fi %endif %changelog +* Thu Oct 31 2019 Carl George - 3:10.3.18-1 +- Rebase to 10.3.18 + * Wed Sep 11 2019 Michal Schorm - 10.3.17-3 - Disable building of the ed25519 client plugin. From now on it will be shipped by 'mariadb-connector-c' package diff --git a/sources b/sources index 3829214..0f51d89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.3.17.tar.gz) = 6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e +SHA512 (mariadb-10.3.18.tar.gz) = 817253d18f20c74f9ec8030678fd50a28b1726fd59153023a3a5e9b3f79e1f44d79feb24ae9ed72d8c1c04017110c932aba7be0610fb06245590c7f5610db242