Fixed LF_BACKOFF calls

MariaDB · Dec 8, 2017 · 927dd9f · 927dd9f
1 parent 3945049
commit 927dd9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
@@ -5560,7 +5560,7 @@ class XID_cache_element
                                           MY_MEMORY_ORDER_RELAXED))
     {
       old&= ACQUIRED | RECOVERED;
-      (void) LF_BACKOFF;
+      (void) LF_BACKOFF();
     }
   }
   bool acquire_recovered()
@@ -5573,7 +5573,7 @@ class XID_cache_element
       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
@@ -268,7 +268,7 @@ static int lockfind(LOCK * volatile *head, LOCK *node,
   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,15 +277,15 @@ static int lockfind(LOCK * volatile *head, LOCK *node,
       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;
     cur_loid= cursor->curr->loid;
     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 @@ static int lockfind(LOCK * volatile *head, LOCK *node,
         lf_alloc_free(pins, cursor->curr);
       else
       {
-        (void)LF_BACKOFF;
+        (void)LF_BACKOFF();
         goto retry;
       }
     }