diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-01 15:06:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-01 15:06:12 +0200 |
| commit | 1b414c0313794c4e9aa36cf099e957f1eb283e3d (patch) | |
| tree | e74ab79115c5d233cf759e8b0c714b3d9f97386d /storage/innobase/ut | |
| parent | 4b291588bb374ec72fd19202911abe949fc0c7c2 (diff) | |
| download | mariadb-git-1b414c0313794c4e9aa36cf099e957f1eb283e3d.tar.gz | |
MDEV-21256 after-merge fix: Use std::atomic
Starting with MariaDB Server 10.4, C++11 is being used.
Hence, std::atomic should be preferred to my_atomic.
Diffstat (limited to 'storage/innobase/ut')
| -rw-r--r-- | storage/innobase/ut/ut0rnd.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ut/ut0rnd.cc b/storage/innobase/ut/ut0rnd.cc index 8265121ef2e..a2e569514cb 100644 --- a/storage/innobase/ut/ut0rnd.cc +++ b/storage/innobase/ut/ut0rnd.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2019, MariaDB Corporation. +Copyright (c) 2019, 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 the Free Software @@ -27,7 +27,7 @@ Created 5/11/1994 Heikki Tuuri #include "ut0rnd.h" /** Seed value of ut_rnd_gen() */ -int32 ut_rnd_current; +std::atomic<uint32_t> ut_rnd_current; /** These random numbers are used in ut_find_prime */ /*@{*/ |