diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 20:59:57 +0300 |
| commit | 7396dfcca7a1eb906edabec02fb59d168f09343d (patch) | |
| tree | 5971546f2d27f5a8dc186e0f63ae3d2ac9208a6a /mysys/lf_hash.c | |
| parent | f79c5a658cc33a10d7744a748a4328254e2cbaf7 (diff) | |
| parent | 7b5543b21d31bd1517b49c2524a05b5b83fd9691 (diff) | |
| download | mariadb-git-7396dfcca7a1eb906edabec02fb59d168f09343d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysys/lf_hash.c')
| -rw-r--r-- | mysys/lf_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index a7c07679993..60dcfd8bed4 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB +/* Copyright (c) 2006, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 2018, MariaDB 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 @@ -102,8 +102,8 @@ retry: do { /* PTR() isn't necessary below, head is a dummy node */ cursor->curr= (LF_SLIST *)(*cursor->prev); lf_pin(pins, 1, cursor->curr); - } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF()); - + } while (my_atomic_loadptr((void**)cursor->prev) != cursor->curr && + LF_BACKOFF()); for (;;) { if (unlikely(!cursor->curr)) |