From 6d923362bd968569acac60b73fbcfbc338841608 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 28 Feb 2023 20:03:38 +0100 Subject: [PATCH 1/2] CONC-637 Build fails when specifying -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF --- libmariadb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmariadb b/libmariadb index d204e831042..4e2408c1cc2 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit d204e83104222844251b221e9be7eb3dd9f8d63d +Subproject commit 4e2408c1cc298ada91b30683501c0c94a6621562 From 948fb3c27d1e0754d99a96389aaf1cf85370d839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 6 Mar 2023 12:01:15 +0200 Subject: [PATCH 2/2] Fix GCC 5.3.1 -Wsign-compare This fixes up commit 57c526ffb852fb027e25fdc77173d45bdc60b8a2 --- sql/sql_select.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 0cb6050759d..8441ec685dc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19088,8 +19088,8 @@ bool Create_tmp_table::add_fields(THD *thd, table->field[fieldnr]= 0; // End marker share->blob_field[m_blob_count]= 0; // End marker copy_func[0]= 0; // End marker - DBUG_ASSERT((copy_func - param->items_to_copy) <= param->copy_func_count); param->func_count= (uint) (copy_func - param->items_to_copy); + DBUG_ASSERT(param->func_count <= param->copy_func_count); share->column_bitmap_size= bitmap_buffer_size(share->fields);