From 35084c5a960a4f9ff63f69cc0da90cda79a693d4 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 25 Oct 2021 09:45:54 +0200 Subject: [PATCH] MDEV-19275 : Fix compiler error - calling covention mismatch (32bit Windows) Error C2440 'initializing': cannot convert from 'MYSQL_RES *(__stdcall *)(MYSQL *)' to 'MYSQL_RES *(__cdecl *)(MYSQL *)' --- sql/sql_prepare.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 7d95ce84ef0..1e978fd1abb 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -6322,13 +6322,17 @@ static void loc_on_close_free(MYSQL *mysql) mysql->info_buffer= 0; } +static MYSQL_RES *loc_use_result(MYSQL *mysql) +{ + return mysql_store_result(mysql); +} static MYSQL_METHODS local_methods= { loc_read_query_result, /* read_query_result */ loc_advanced_command, /* advanced_command */ loc_read_rows, /* read_rows */ - mysql_store_result, /* use_result */ + loc_use_result, /* use_result */ loc_fetch_lengths, /* fetch_lengths */ loc_flush_use_result, /* flush_use_result */ NULL, /* read_change_user_result */