Merge branch '11.1' into mariadb-11.1.2

.gitignore

@@ -123,6 +123,7 @@ scripts/mysql_find_rows
 scripts/mysql_fix_extensions
 scripts/mariadb_fix_privilege_tables.sql
 scripts/mariadb_fix_privilege_tables_sql.c
+scripts/mariadb_sys_schema.sql
 scripts/mysql_install_db
 scripts/mysql_secure_installation
 scripts/mysql_setpermission

VERSION

 MYSQL_VERSION_MAJOR=11
 MYSQL_VERSION_MINOR=1
-MYSQL_VERSION_PATCH=2
+MYSQL_VERSION_PATCH=3
 SERVER_MATURITY=stable

sql/events.cc

@@ -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;