From b563fa2f8fa2326e686c787be619ef36bdc7b77b Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 9 Aug 2023 18:22:36 +0300 Subject: [PATCH 1/3] Ignore generated script scripts/mariadb_sys_schema.sql --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ac67886c51cb8..51f6ae67e7538 100644 --- a/.gitignore +++ b/.gitignore @@ -122,6 +122,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 From 9b84df878a57cb9042437acacb9a359f0cfb6566 Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 9 Aug 2023 18:25:31 +0300 Subject: [PATCH 2/3] 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. --- sql/events.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/events.cc b/sql/events.cc index e3b921c0ccf33..8a01f1f692b8d 100644 --- a/sql/events.cc +++ b/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; From 676a913c64431b7118295c8c1188c6329207dbda Mon Sep 17 00:00:00 2001 From: Daniel Bartholomew Date: Mon, 21 Aug 2023 09:06:04 -0400 Subject: [PATCH 3/3] bump the VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 08c90b8992780..e447f0fec473b 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=11 MYSQL_VERSION_MINOR=1 -MYSQL_VERSION_PATCH=2 +MYSQL_VERSION_PATCH=3 SERVER_MATURITY=beta