diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 22:06:55 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 22:06:55 +0200 |
| commit | bd3c8f47cd16b4795dd073bbd30decd804c76969 (patch) | |
| tree | 684f91877eb6835e6335d614fafce9841eaf30af /sql/rpl_gtid.cc | |
| parent | d529389358fb0c7f3e642d34d7fd84df307b9d29 (diff) | |
| parent | fd5c36bed5de65e85900c9fc9f0ed2092c4b38c5 (diff) | |
| download | mariadb-git-bd3c8f47cd16b4795dd073bbd30decd804c76969.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/rpl_gtid.cc')
| -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 a159434f14b..5681f8652a4 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 @@ -2561,7 +2562,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; |