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

Fix compilation warnings in -DWITH_WSREP=OFF build.

Browse Source
This commit is contained in:
Kristian Nielsen
2015-05-11 12:47:43 +02:00
parent 8bedb638d7
commit 6e49201644
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/event_data_objects.cc
View File

@ -1482,7 +1482,9 @@ end:
WSREP_TO_ISOLATION_END; WSREP_TO_ISOLATION_END;
#ifdef WITH_WSREP
error: error:
#endif
thd->tx_read_only= save_tx_read_only; thd->tx_read_only= save_tx_read_only;
thd->security_ctx->master_access= saved_master_access; thd->security_ctx->master_access= saved_master_access;
} }

2
sql/mysqld.cc
View File

@ -5730,7 +5730,9 @@ int mysqld_main(int argc, char **argv)
} }
} }
else else
{
wsrep_init_startup (false); wsrep_init_startup (false);
}
if (opt_bootstrap) if (opt_bootstrap)
{ {

2
sql/slave.cc
View File

@ -4406,7 +4406,9 @@ pthread_handler_t handle_slave_sql(void *arg)
my_thread_init(); my_thread_init();
DBUG_ENTER("handle_slave_sql"); DBUG_ENTER("handle_slave_sql");
#ifdef WITH_WSREP
wsrep_restart_point: wsrep_restart_point:
#endif
serial_rgi= new rpl_group_info(rli); serial_rgi= new rpl_group_info(rli);
thd = new THD; // note that contructor of THD uses DBUG_ ! thd = new THD; // note that contructor of THD uses DBUG_ !