diff options
Diffstat (limited to 'mysql-test/t/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade.test | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test index 13be03aa9bb..a24ba0de2d9 100644 --- a/mysql-test/t/mysql_upgrade.test +++ b/mysql-test/t/mysql_upgrade.test @@ -1,5 +1,6 @@ -- source include/mysql_upgrade_preparation.inc -- source include/have_working_dns.inc +-- source include/have_innodb.inc # # Basic test that we can run mysql_upgrde and that it finds the @@ -51,7 +52,7 @@ DROP USER mysqltest1@'%'; --echo Run mysql_upgrade with a non existing server socket --replace_result $MYSQLTEST_VARDIR var ---replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/ +--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9|-]*\)/(errno)/ --error 1 # NC: Added --skip-version-check, as the version check would fail when # mysql_upgrade tries to get the server version. @@ -129,28 +130,11 @@ let $MYSQLD_DATADIR= `select @@datadir`; # so the following command should never fail. --remove_file $MYSQLD_DATADIR/mysql_upgrade_info - -# 5.5-only test (involves manual modification of system tables) --echo # --echo # MDEV-4332 Increase username length from 16 characters --echo # MDEV-6068, MDEV-6178 mysql_upgrade breaks databases with long user names --echo # -alter table mysql.user modify User char(80) binary not null default ''; -alter table mysql.db modify User char(80) binary not null default ''; -alter table mysql.tables_priv modify User char(80) binary not null default ''; -alter table mysql.columns_priv modify User char(80) binary not null default ''; -alter table mysql.procs_priv modify User char(80) binary not null default ''; -alter table mysql.proc modify definer char(141) collate utf8_bin not null default ''; -alter table mysql.event modify definer char(141) collate utf8_bin not null default ''; -alter table mysql.proxies_priv modify User char(80) COLLATE utf8_bin not null default ''; -alter table mysql.proxies_priv modify Proxied_user char(80) COLLATE utf8_bin not null default ''; -alter table mysql.proxies_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; -alter table mysql.servers modify Username char(80) not null default ''; -alter table mysql.procs_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; -alter table mysql.tables_priv modify Grantor char(141) COLLATE utf8_bin not null default ''; -flush privileges; - connection default; GRANT SELECT ON mysql.* TO very_long_user_name_number_1; GRANT SELECT ON mysql.* TO very_long_user_name_number_2; @@ -174,21 +158,4 @@ SELECT grantor FROM mysql.tables_priv WHERE db = 'mysql' AND table_name = 'user' DROP USER very_long_user_name_number_1, very_long_user_name_number_2, even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost; DROP PROCEDURE test.pr; -# Restore system tables - -alter table mysql.user modify User char(16) binary not null default ''; -alter table mysql.db modify User char(16) binary not null default ''; -alter table mysql.tables_priv modify User char(16) binary not null default ''; -alter table mysql.columns_priv modify User char(16) binary not null default ''; -alter table mysql.procs_priv modify User char(16) binary not null default ''; -alter table mysql.proc modify definer char(77) collate utf8_bin not null default ''; -alter table mysql.event modify definer char(77) collate utf8_bin not null default ''; -alter table mysql.proxies_priv modify User char(16) COLLATE utf8_bin not null default ''; -alter table mysql.proxies_priv modify Proxied_user char(16) COLLATE utf8_bin not null default ''; -alter table mysql.proxies_priv modify Grantor char(77) COLLATE utf8_bin not null default ''; -alter table mysql.servers modify Username char(64) not null default ''; -alter table mysql.procs_priv modify Grantor char(77) COLLATE utf8_bin not null default ''; -alter table mysql.tables_priv modify Grantor char(77) COLLATE utf8_bin not null default ''; -flush privileges; - --echo End of tests |