diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
| commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
| tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /mysys/lf_hash.c | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz | |
Merge 10.1 into 10.2
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 430f1007f30..64e5c5e3e93 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)) |