Skip to content

Commit 35084c5

Browse files
committed
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 *)'
1 parent 9624bb0 commit 35084c5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

sql/sql_prepare.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6322,13 +6322,17 @@ static void loc_on_close_free(MYSQL *mysql)
63226322
mysql->info_buffer= 0;
63236323
}
63246324

6325+
static MYSQL_RES *loc_use_result(MYSQL *mysql)
6326+
{
6327+
return mysql_store_result(mysql);
6328+
}
63256329

63266330
static MYSQL_METHODS local_methods=
63276331
{
63286332
loc_read_query_result, /* read_query_result */
63296333
loc_advanced_command, /* advanced_command */
63306334
loc_read_rows, /* read_rows */
6331-
mysql_store_result, /* use_result */
6335+
loc_use_result, /* use_result */
63326336
loc_fetch_lengths, /* fetch_lengths */
63336337
loc_flush_use_result, /* flush_use_result */
63346338
NULL, /* read_change_user_result */

0 commit comments

Comments
 (0)