database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-8324 - MariaDB fails to build with performance schema disabled

Browse Source 
Various fixes to let MariaDB compile with performance schema disabled.
This commit is contained in:
Sergey Vojtovich
2015-06-17 12:37:19 +04:00
parent 366cda4937
commit 2b253ed41f
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/table_cache.h
View File

@@ -16,8 +16,10 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#ifdef HAVE_PSI_INTERFACE
extern PSI_mutex_key key_TABLE_SHARE_LOCK_table_share; extern PSI_mutex_key key_TABLE_SHARE_LOCK_table_share;
extern PSI_cond_key key_TABLE_SHARE_COND_release; extern PSI_cond_key key_TABLE_SHARE_COND_release;
#endif
class TDC_element class TDC_element
{ {

9
sql/wsrep_mysqld.cc
View File

@@ -164,10 +164,6 @@ static PSI_file_info wsrep_files[]=
{ {
{ &key_file_wsrep_gra_log, "wsrep_gra_log", 0} { &key_file_wsrep_gra_log, "wsrep_gra_log", 0}
}; };
#else
#define mysql_mutex_register(X,Y,Z)
#define mysql_cond_register(X,Y,Z)
#endif #endif
my_bool wsrep_inited = 0; // initialized ? my_bool wsrep_inited = 0; // initialized ?
@@ -811,8 +807,11 @@ int wsrep_init()
/* Initialize wsrep thread LOCKs and CONDs */ /* Initialize wsrep thread LOCKs and CONDs */
void wsrep_thr_init() void wsrep_thr_init()
{ {
#ifdef HAVE_PSI_INTERFACE
mysql_mutex_register("sql", wsrep_mutexes, array_elements(wsrep_mutexes)); mysql_mutex_register("sql", wsrep_mutexes, array_elements(wsrep_mutexes));
mysql_cond_register("sql", wsrep_conds, array_elements(wsrep_conds)); mysql_cond_register("sql", wsrep_conds, array_elements(wsrep_conds));
mysql_file_register("sql", wsrep_files, array_elements(wsrep_files));
#endif
mysql_mutex_init(key_LOCK_wsrep_ready, &LOCK_wsrep_ready, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_LOCK_wsrep_ready, &LOCK_wsrep_ready, MY_MUTEX_INIT_FAST);
mysql_cond_init(key_COND_wsrep_ready, &COND_wsrep_ready, NULL); mysql_cond_init(key_COND_wsrep_ready, &COND_wsrep_ready, NULL);
@@ -827,8 +826,6 @@ void wsrep_thr_init()
mysql_mutex_init(key_LOCK_wsrep_slave_threads, &LOCK_wsrep_slave_threads, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_LOCK_wsrep_slave_threads, &LOCK_wsrep_slave_threads, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_wsrep_desync, &LOCK_wsrep_desync, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_LOCK_wsrep_desync, &LOCK_wsrep_desync, MY_MUTEX_INIT_FAST);
mysql_mutex_init(key_LOCK_wsrep_config_state, &LOCK_wsrep_config_state, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_LOCK_wsrep_config_state, &LOCK_wsrep_config_state, MY_MUTEX_INIT_FAST);
mysql_file_register("sql", wsrep_files, array_elements(wsrep_files));
} }

2
storage/innobase/include/sync0rw.h
View File

@@ -162,7 +162,7 @@ defined, the rwlock are instrumented with performance schema probes. */
# endif/* UNIV_SYNC_DEBUG */ # endif/* UNIV_SYNC_DEBUG */
# else /* UNIV_DEBUG */ # else /* UNIV_DEBUG */
# define rw_lock_create(K, L, level) \ # define rw_lock_create(K, L, level) \
rw_lock_create_func((L), __FILE__, __LINE__) rw_lock_create_func((L), #L, __FILE__, __LINE__)
# endif /* UNIV_DEBUG */ # endif /* UNIV_DEBUG */
/**************************************************************//** /**************************************************************//**

2
storage/innobase/include/sync0sync.h
View File

@@ -210,7 +210,7 @@ original non-instrumented functions */
# endif /* UNIV_SYNC_DEBUG */ # endif /* UNIV_SYNC_DEBUG */
# else /* UNIV_DEBUG */ # else /* UNIV_DEBUG */
# define mutex_create(K, M, level) \ # define mutex_create(K, M, level) \
mutex_create_func((M), __FILE__, __LINE__) mutex_create_func((M), #M, __FILE__, __LINE__)
# endif /* UNIV_DEBUG */ # endif /* UNIV_DEBUG */
# define mutex_enter(M) mutex_enter_func((M), __FILE__, __LINE__) # define mutex_enter(M) mutex_enter_func((M), __FILE__, __LINE__)

2
storage/xtradb/include/sync0rw.h
View File

@@ -163,7 +163,7 @@ defined, the rwlock are instrumented with performance schema probes. */
# endif/* UNIV_SYNC_DEBUG */ # endif/* UNIV_SYNC_DEBUG */
# else /* UNIV_DEBUG */ # else /* UNIV_DEBUG */
# define rw_lock_create(K, L, level) \ # define rw_lock_create(K, L, level) \
rw_lock_create_func((L), __FILE__, __LINE__) rw_lock_create_func((L), #L, __FILE__, __LINE__)
# endif /* UNIV_DEBUG */ # endif /* UNIV_DEBUG */
/**************************************************************//** /**************************************************************//**

2
storage/xtradb/include/sync0sync.h
View File

@@ -224,7 +224,7 @@ original non-instrumented functions */
# endif /* UNIV_SYNC_DEBUG */ # endif /* UNIV_SYNC_DEBUG */
# else /* UNIV_DEBUG */ # else /* UNIV_DEBUG */
# define mutex_create(K, M, level) \ # define mutex_create(K, M, level) \
mutex_create_func((M), #M) mutex_create_func((M), __FILE__, __LINE__, #M)
# endif /* UNIV_DEBUG */ # endif /* UNIV_DEBUG */
# define mutex_enter(M) mutex_enter_func((M), __FILE__, __LINE__) # define mutex_enter(M) mutex_enter_func((M), __FILE__, __LINE__)