[Commits] 184734f: MDEV-9026: Revert patch for MDEV-6069

Nirbhay Choubey nirbhay at mariadb.com
Wed Nov 4 21:56:21 EET 2015

revision-id: 184734f0d4a5befa53640d4d22a9fd761313df77
parent(s): 1216429cfdb0e2015cc98ab0145228a7837722d7
committer: Nirbhay Choubey
branch nick: 10.1
timestamp: 2015-11-04 14:56:21 -0500

MDEV-9026: Revert patch for MDEV-6069

Reverting the patch for MDEV-6069 brought some ALTERs
with ENGINE=MYISAM back in mysql_system_tables_fix.sql
script. As a result, running mysql_upgrade with global
enforce_storage_engine=INNODB (or any other non-MyISAM
engine, for that matter) would create problems.

Fixed by locally turning off enforce_storage_engine in
the upgrade script.

 scripts/mysql_system_tables_fix.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 231c595..ec47a1c 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -1,5 +1,5 @@
 -- Copyright (C) 2003, 2013 Oracle and/or its affiliates.
--- Copyright (C) 2010, 2014 SkySQL Ab.
+-- Copyright (C) 2010, 2015 MariaDB Corporation Ab.
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 set sql_mode='';
 set storage_engine=MyISAM;
+set enforce_storage_engine=NULL;
 ALTER TABLE user add File_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL;

More information about the commits mailing list