diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:08:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-20 18:12:17 +0200 |
| commit | 44298e4dea39280187c587c6e776ce8d04e350de (patch) | |
| tree | 15f8bac3c985c4f07fd6af066439d046dbb13c35 /sql/rpl_gtid.cc | |
| parent | dd68db0c17d674f1b64e70ff7ea9e3f4abe4ee3e (diff) | |
| parent | 9f7b8625e698da6b7eba7c26e765c66635571919 (diff) | |
| download | mariadb-git-44298e4dea39280187c587c6e776ce8d04e350de.tar.gz | |
Merge 10.2 into 10.3
Also, clean up the test innodb_gis.geometry a little further.
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 b34942ba091..a8b39d6d15b 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 @@ -2432,7 +2433,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; |