Commit 9f7b8625 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-14431: Fix ulong/ulonglong type mismatch

parent b034d708
/* Copyright (c) 2013, Kristian Nielsen and MariaDB Services Ab. /* Copyright (c) 2013, Kristian Nielsen and MariaDB Services Ab.
Copyright (c) 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -2226,7 +2227,8 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us) ...@@ -2226,7 +2227,8 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us)
/* fall through */ /* fall through */
case 0: case 0:
status_var_add(thd->status_var.master_gtid_wait_time, status_var_add(thd->status_var.master_gtid_wait_time,
microsecond_interval_timer() - before); static_cast<ulong>
(microsecond_interval_timer() - before));
} }
my_free(wait_pos); my_free(wait_pos);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment