diff options
| author | Varun Gupta <varunraiko1803@gmail.com> | 2017-12-12 12:09:52 +0530 |
|---|---|---|
| committer | Varun Gupta <varunraiko1803@gmail.com> | 2017-12-12 12:09:52 +0530 |
| commit | 62eaf7b657fd25bb4457049c81fb929314d6eb1d (patch) | |
| tree | 65b74828366257a0329af383b3a631938a85c097 | |
| parent | 70d6c944cbc1a71c386db6eaaddc4b10cd8ee99b (diff) | |
| download | mariadb-git-62eaf7b657fd25bb4457049c81fb929314d6eb1d.tar.gz | |
MDEV-14573: Upgrade from previous versions is broken for procedures
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix50030.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db_fix50117.result | 1 | ||||
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/system_mysql_db_fix50030.result b/mysql-test/r/system_mysql_db_fix50030.result index ad74cf6a09d..0ebc7934f76 100644 --- a/mysql-test/r/system_mysql_db_fix50030.result +++ b/mysql-test/r/system_mysql_db_fix50030.result @@ -220,6 +220,7 @@ proc CREATE TABLE `proc` ( `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `body_utf8` longblob DEFAULT NULL, + `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE', PRIMARY KEY (`db`,`name`,`type`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures' show create table event; diff --git a/mysql-test/r/system_mysql_db_fix50117.result b/mysql-test/r/system_mysql_db_fix50117.result index 7ba77e60e42..1227896853d 100644 --- a/mysql-test/r/system_mysql_db_fix50117.result +++ b/mysql-test/r/system_mysql_db_fix50117.result @@ -220,6 +220,7 @@ proc CREATE TABLE `proc` ( `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `body_utf8` longblob DEFAULT NULL, + `aggregate` enum('NONE','GROUP') NOT NULL DEFAULT 'NONE', PRIMARY KEY (`db`,`name`,`type`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures' show create table event; diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 10e2dcf21fb..127e06cda52 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -519,6 +519,10 @@ ALTER TABLE proc MODIFY body_utf8 longblob DEFAULT NULL; ALTER TABLE proc MODIFY comment text collate utf8_bin NOT NULL; +# MDEV-7773: Stored Aggregate Functions +ALTER TABLE proc ADD aggregate enum('NONE', 'GROUP') DEFAULT 'NONE' NOT NULL + AFTER body_utf8; + # # EVENT privilege # |