diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-04 15:00:34 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-11-04 15:00:34 -0500 |
| commit | f9e320c82daec5acc21884c2b09a139e19632c45 (patch) | |
| tree | 7c0a01766a6e5149c5de5a4e6d1a6f389a6ea3e7 | |
| parent | 1216429cfdb0e2015cc98ab0145228a7837722d7 (diff) | |
| download | mariadb-git-f9e320c82daec5acc21884c2b09a139e19632c45.tar.gz | |
MDEV-9026: Revert patch for MDEV-6069
Post-fix:
Reverting the patch for MDEV-6069 brought some ALTERs with
ENGINE=MYISAM back into the 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 fail.
Fixed by locally unsetting enforce_storage_engine in the
upgrade script.
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 231c5951a2d..ec47a1c65db 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; |