Don't give a warning about Event_scheduler for --bootstrap

The reason is that --bootstrap is used to initialize the server and
a lot of processes are not started in this case. Event scheduler is
not an exception.

This fix also removes an unexpected warning about event scheduler when
running mariadb_install_db.
This commit is contained in:
Monty 2023-08-09 18:25:31 +03:00
parent b563fa2f8f
commit 9b84df878a

View file

@ -886,9 +886,9 @@ Events::init(THD *thd, bool opt_noacl_or_bootstrap)
/*
Was disabled explicitly from the command line
*/
if (opt_event_scheduler == Events::EVENTS_DISABLED)
if (opt_event_scheduler == Events::EVENTS_DISABLED || opt_bootstrap)
DBUG_RETURN(FALSE);
else if (opt_noacl_or_bootstrap)
if (opt_noacl_or_bootstrap)
{
if (opt_event_scheduler == Events::EVENTS_ON)
sql_print_error("Event Scheduler will not function when starting with %s",
@ -900,7 +900,6 @@ Events::init(THD *thd, bool opt_noacl_or_bootstrap)
/* We need a temporary THD during boot */
if (!thd)
{
if (!(thd= new THD(0)))
{
res= TRUE;