summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade.test
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-10-17 08:43:55 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-10-17 08:43:55 +0200
commit851b31bcc47b742cd3b39ad06176b0e8be591c18 (patch)
tree93da42af4bd22fc448df71777bedb0a4690478ba /mysql-test/main/mysql_upgrade.test
parent618d82064618bda06bcd080af5b664b3d173dbe3 (diff)
parenta4234f0410008e14aa2ad7ad56973127f3046d5c (diff)
downloadmariadb-git-851b31bcc47b742cd3b39ad06176b0e8be591c18.tar.gz
Merge branch 'bb-10.8-vp-MDEV-27691' into 10.8
Diffstat (limited to 'mysql-test/main/mysql_upgrade.test')
-rw-r--r--mysql-test/main/mysql_upgrade.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index 69c850deef5..c5493dbaccf 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -149,7 +149,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--echo # MDEV-4332 Increase username length from 16 characters
--echo # MDEV-6068, MDEV-6178 mysql_upgrade breaks databases with long user names
--echo #
-
+--disable_service_connection
connection default;
GRANT SELECT ON mysql.* TO very_long_user_name_number_1;
GRANT SELECT ON mysql.* TO very_long_user_name_number_2;
@@ -172,7 +172,7 @@ SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr';
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;
-
+--enable_service_connection
#
# MDEV-13274 mysql_upgrade fails if dbname+tablename+partioname > 64 chars
#