database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup, less #ifdef's

Browse Source
This commit is contained in:
Sergei Golubchik
2020-06-14 11:46:37 +02:00
parent 7d75e43261
commit d2b852b4ca
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -2443,14 +2443,11 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
} }
else else
{ {
#ifdef WITH_WSREP if (WSREP(thd) && !wsrep_should_replicate_ddl(thd, table_type->db_type))
if (WSREP(thd) &&
!wsrep_should_replicate_ddl(thd, table_type->db_type))
{ {
error= 1; error= 1;
goto err; goto err;
} }
#endif
/* /*
It could happen that table's share in the table definition cache It could happen that table's share in the table definition cache

1
sql/wsrep_mysqld.h
View File

@ -627,6 +627,7 @@ enum wsrep::streaming_context::fragment_unit wsrep_fragment_unit(ulong unit);
#define wsrep_thr_deinit() do {} while(0) #define wsrep_thr_deinit() do {} while(0)
#define wsrep_init_globals() do {} while(0) #define wsrep_init_globals() do {} while(0)
#define wsrep_create_appliers(X) do {} while(0) #define wsrep_create_appliers(X) do {} while(0)
#define wsrep_should_replicate_ddl(X,Y) (1)
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */

4
storage/example/ha_example.cc
View File

@ -215,6 +215,8 @@ static void init_example_psi_keys()
count= array_elements(all_example_mutexes); count= array_elements(all_example_mutexes);
mysql_mutex_register(category, all_example_mutexes, count); mysql_mutex_register(category, all_example_mutexes, count);
} }
#else
static void init_example_psi_keys() { }
#endif #endif
@ -252,9 +254,7 @@ static int example_init_func(void *p)
{ {
DBUG_ENTER("example_init_func"); DBUG_ENTER("example_init_func");
#ifdef HAVE_PSI_INTERFACE
init_example_psi_keys(); init_example_psi_keys();
#endif
example_hton= (handlerton *)p; example_hton= (handlerton *)p;
example_hton->create= example_create_handler; example_hton->create= example_create_handler;

2
storage/heap/ha_heap.cc
View File

@ -44,9 +44,7 @@ int heap_init(void *p)
{ {
handlerton *heap_hton; handlerton *heap_hton;
#ifdef HAVE_PSI_INTERFACE
init_heap_psi_keys(); init_heap_psi_keys();
#endif
heap_hton= (handlerton *)p; heap_hton= (handlerton *)p;
heap_hton->db_type= DB_TYPE_HEAP; heap_hton->db_type= DB_TYPE_HEAP;

2
storage/heap/heapdef.h
View File

@ -110,6 +110,8 @@ extern PSI_memory_key hp_key_memory_HP_KEYDEF;
#ifdef HAVE_PSI_INTERFACE #ifdef HAVE_PSI_INTERFACE
void init_heap_psi_keys(); void init_heap_psi_keys();
#else
#define init_heap_psi_keys() do { } while(0)
#endif /* HAVE_PSI_INTERFACE */ #endif /* HAVE_PSI_INTERFACE */
C_MODE_END C_MODE_END

2
storage/myisam/ha_myisam.cc
View File

@ -2516,9 +2516,7 @@ static int myisam_init(void *p)
{ {
handlerton *hton; handlerton *hton;
#ifdef HAVE_PSI_INTERFACE
init_myisam_psi_keys(); init_myisam_psi_keys();
#endif
/* Set global variables based on startup options */ /* Set global variables based on startup options */
if (myisam_recover_options && myisam_recover_options != HA_RECOVER_OFF) if (myisam_recover_options && myisam_recover_options != HA_RECOVER_OFF)

2
storage/myisam/myisamdef.h
View File

@ -774,6 +774,8 @@ extern PSI_file_key mi_key_file_datatmp, mi_key_file_dfile, mi_key_file_kfile,
extern PSI_thread_key mi_key_thread_find_all_keys; extern PSI_thread_key mi_key_thread_find_all_keys;
void init_myisam_psi_keys(); void init_myisam_psi_keys();
#else
#define init_myisam_psi_keys() do { } while(0)
#endif /* HAVE_PSI_INTERFACE */ #endif /* HAVE_PSI_INTERFACE */
extern PSI_memory_key mi_key_memory_MYISAM_SHARE; extern PSI_memory_key mi_key_memory_MYISAM_SHARE;