Commit f7628ca3 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove useless "inline" keywords

avoid a function call for a commonly used one-liner.
followup for 0627929f
parent 7dc1815d
...@@ -2293,7 +2293,7 @@ static int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len) ...@@ -2293,7 +2293,7 @@ static int wsrep_create_sp(THD *thd, uchar** buf, size_t* buf_len)
} }
extern inline int wsrep_on(THD *thd) extern int wsrep_on(THD *thd)
{ {
return (int)(WSREP(thd)); return (int)(WSREP(thd));
} }
......
...@@ -1026,8 +1026,7 @@ lock_get_info( ...@@ -1026,8 +1026,7 @@ lock_get_info(
/*******************************************************************//** /*******************************************************************//**
@return whether wsrep_on is true on trx->mysql_thd*/ @return whether wsrep_on is true on trx->mysql_thd*/
bool #define wsrep_on_trx(trx) ((trx)->mysql_thd && wsrep_on((trx)->mysql_thd))
wsrep_on_trx(const trx_t* trx);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
#ifndef UNIV_NONINL #ifndef UNIV_NONINL
......
...@@ -8213,11 +8213,3 @@ lock_get_info( ...@@ -8213,11 +8213,3 @@ lock_get_info(
return info; return info;
} }
#ifdef WITH_WSREP
bool inline
wsrep_on_trx(const trx_t* trx)
{
return trx->mysql_thd && wsrep_on(trx->mysql_thd);
}
#endif /* WITH_WSREP */
...@@ -1028,14 +1028,8 @@ Get lock mode and table/index name ...@@ -1028,14 +1028,8 @@ Get lock mode and table/index name
std::string std::string
lock_get_info( lock_get_info(
const lock_t*); const lock_t*);
#ifdef WITH_WSREP
/*******************************************************************//** #define wsrep_on_trx(trx) ((trx)->mysql_thd && wsrep_on((trx)->mysql_thd))
@return whether wsrep_on is true on trx->mysql_thd*/
bool
wsrep_on_trx(const trx_t* trx);
#endif /* WITH_WSREP */
#ifndef UNIV_NONINL #ifndef UNIV_NONINL
#include "lock0lock.ic" #include "lock0lock.ic"
......
...@@ -8336,11 +8336,3 @@ lock_get_info( ...@@ -8336,11 +8336,3 @@ lock_get_info(
return info; return info;
} }
#ifdef WITH_WSREP
bool inline
wsrep_on_trx(const trx_t* trx)
{
return trx->mysql_thd && wsrep_on(trx->mysql_thd);
}
#endif /* WITH_WSREP */
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