From 927dd9f355c742ce896983969b82cb3198c250ff Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 8 Dec 2017 21:35:29 +0400 Subject: [PATCH] Fixed LF_BACKOFF calls --- sql/sql_class.cc | 4 ++-- storage/maria/lockman.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index c4ac5705c08..185b43dd807 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -5560,7 +5560,7 @@ public: MY_MEMORY_ORDER_RELAXED)) { old&= ACQUIRED | RECOVERED; - (void) LF_BACKOFF; + (void) LF_BACKOFF(); } } bool acquire_recovered() @@ -5573,7 +5573,7 @@ public: if (!(old & RECOVERED) || (old & ACQUIRED)) return false; old= RECOVERED; - (void) LF_BACKOFF; + (void) LF_BACKOFF(); } return true; } diff --git a/storage/maria/lockman.c b/storage/maria/lockman.c index efdf7e1c4b8..fa0a3289106 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -268,7 +268,7 @@ retry: do { cursor->curr= PTR(*cursor->prev); lf_pin(pins, 1, cursor->curr); - } while(*cursor->prev != (intptr)cursor->curr && LF_BACKOFF); + } while(*cursor->prev != (intptr)cursor->curr && LF_BACKOFF()); for (;;) { if (!cursor->curr) @@ -277,7 +277,7 @@ retry: cur_link= cursor->curr->link; cursor->next= PTR(cur_link); lf_pin(pins, 0, cursor->next); - } while (cur_link != cursor->curr->link && LF_BACKOFF); + } while (cur_link != cursor->curr->link && LF_BACKOFF()); cur_hashnr= cursor->curr->hashnr; cur_resource= cursor->curr->resource; cur_lock= cursor->curr->lock; @@ -285,7 +285,7 @@ retry: cur_flags= cursor->curr->flags; if (*cursor->prev != (intptr)cursor->curr) { - (void)LF_BACKOFF; + (void)LF_BACKOFF(); goto retry; } if (!DELETED(cur_link)) @@ -362,7 +362,7 @@ retry: lf_alloc_free(pins, cursor->curr); else { - (void)LF_BACKOFF; + (void)LF_BACKOFF(); goto retry; } }