Commit 6e492016 authored by Kristian Nielsen's avatar Kristian Nielsen

Fix compilation warnings in -DWITH_WSREP=OFF build.

parent 8bedb638
......@@ -1482,7 +1482,9 @@ end:
WSREP_TO_ISOLATION_END;
#ifdef WITH_WSREP
error:
#endif
thd->tx_read_only= save_tx_read_only;
thd->security_ctx->master_access= saved_master_access;
}
......
......@@ -5730,7 +5730,9 @@ int mysqld_main(int argc, char **argv)
}
}
else
{
wsrep_init_startup (false);
}
if (opt_bootstrap)
{
......
......@@ -4406,7 +4406,9 @@ pthread_handler_t handle_slave_sql(void *arg)
my_thread_init();
DBUG_ENTER("handle_slave_sql");
#ifdef WITH_WSREP
wsrep_restart_point:
#endif
serial_rgi= new rpl_group_info(rli);
thd = new THD; // note that contructor of THD uses DBUG_ !
......
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