summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-05-20 11:42:00 +0200
committerSergei Golubchik <serg@mariadb.org>2021-05-20 17:05:52 +0200
commit4e946cb1f17fbb15c26ff4c0e91f479e618e7a4a (patch)
tree6b439a758bde1357fbfac1cc4db9cc430b43eaf8
parent852d1f8eb920e4c2385961245595093e34fec6b6 (diff)
downloadmariadb-git-4e946cb1f17fbb15c26ff4c0e91f479e618e7a4a.tar.gz
fix of MDEV-24312
Move event table change to the group of the event table changes after which event scheduler can be started.
-rw-r--r--scripts/mysql_system_tables_fix.sql3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 78e8e06783a..ed89cc1fd6c 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -631,6 +631,8 @@ ALTER TABLE event ADD body_utf8 longblob DEFAULT NULL
AFTER db_collation;
ALTER TABLE event MODIFY body_utf8 longblob DEFAULT NULL;
+alter table event MODIFY definer varchar(384) collate utf8_bin NOT NULL DEFAULT '';
+
# Enable event scheduler if the event table was not up to date before.
set global event_scheduler=original;
@@ -746,7 +748,6 @@ alter table tables_priv modify User char(128) binary not null default
alter table columns_priv modify User char(128) binary not null default '';
alter table procs_priv modify User char(128) binary not null default '';
alter table proc modify definer varchar(384) collate utf8_bin not null default '';
-alter table event modify definer varchar(384) collate utf8_bin not null default '';
alter table proxies_priv modify User char(128) COLLATE utf8_bin not null default '';
alter table proxies_priv modify Proxied_user char(128) COLLATE utf8_bin not null default '';
alter table proxies_priv modify Grantor varchar(384) COLLATE utf8_bin not null default '';