diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 17:40:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 17:46:43 +0200 |
| commit | 9f7b8625e698da6b7eba7c26e765c66635571919 (patch) | |
| tree | e7279892cb8f346718407d123360a82203fa7aba /sql | |
| parent | b034d708c813fa9c274fe14a1492dac62c923cb7 (diff) | |
| download | mariadb-git-9f7b8625e698da6b7eba7c26e765c66635571919.tar.gz | |
MDEV-14431: Fix ulong/ulonglong type mismatch
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/rpl_gtid.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index cc6c169c0df..43fdeec9e6a 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -1,4 +1,5 @@ /* 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 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) /* fall through */ case 0: 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); return err; |