Commit 2b63a591 authored by unknown's avatar unknown

Fixed some compiler errors


mysys/my_thr_init.c:
  Added missing DBUG_OFF
storage/maria/ma_loghandler.c:
  Fixed wrong macro
parent cfcf7ef1
...@@ -385,6 +385,8 @@ struct st_my_thread_var *_my_thread_var(void) ...@@ -385,6 +385,8 @@ struct st_my_thread_var *_my_thread_var(void)
return tmp; return tmp;
} }
#ifndef DBUG_OFF
extern void *my_thread_var_get_dbug(my_bool *error) extern void *my_thread_var_get_dbug(my_bool *error)
{ {
struct st_my_thread_var *tmp= struct st_my_thread_var *tmp=
...@@ -406,7 +408,7 @@ extern void my_thread_var_set_dbug(void *dbug) ...@@ -406,7 +408,7 @@ extern void my_thread_var_set_dbug(void *dbug)
struct st_my_thread_var *tmp= _my_thread_var(); struct st_my_thread_var *tmp= _my_thread_var();
tmp->dbug= dbug; tmp->dbug= dbug;
} }
#endif
/**************************************************************************** /****************************************************************************
Get name of current thread. Get name of current thread.
......
...@@ -1262,7 +1262,7 @@ static my_bool translog_buffer_lock(struct st_translog_buffer *buffer) ...@@ -1262,7 +1262,7 @@ static my_bool translog_buffer_lock(struct st_translog_buffer *buffer)
} }
#else #else
#define translog_buffer_lock(B) \ #define translog_buffer_lock(B) \
pthread_mutex_lock(&B->mutex) pthread_mutex_lock(&((B)->mutex))
#endif #endif
...@@ -1296,7 +1296,7 @@ static my_bool translog_buffer_unlock(struct st_translog_buffer *buffer) ...@@ -1296,7 +1296,7 @@ static my_bool translog_buffer_unlock(struct st_translog_buffer *buffer)
} }
#else #else
#define translog_buffer_unlock(B) \ #define translog_buffer_unlock(B) \
pthread_mutex_unlock(&B->mutex) pthread_mutex_unlock(&((B)->mutex))
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment