summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-01-10 21:25:17 +0100
committerSergei Golubchik <serg@mariadb.org>2021-01-12 10:25:04 +0100
commit0ee086838d4b4497599d4e0822343269b682f913 (patch)
treee6b90b322f14f256490c3363d7dc11c84ed7c425
parentf144ce2cfa086182fbd2b44408c70bd3456408f2 (diff)
downloadmariadb-git-0ee086838d4b4497599d4e0822343269b682f913.tar.gz
MDEV-16735 mysql_upgrade failed
force alter_algorithm=DEFAULT in mysql_system_tables_fix.sql, in case my.cnf sets it to something incompatible
-rw-r--r--scripts/mysql_system_tables_fix.sql1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 0c39e62cc9a..0a10253c5b3 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -27,6 +27,7 @@
set sql_mode='';
set storage_engine=MyISAM;
set enforce_storage_engine=NULL;
+set alter_algorithm=DEFAULT;
ALTER TABLE user add File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;