Skip to content

M
mariadb
Commit f91dafc2 authored by Daniel Black's avatar Daniel Black
Browse files
Options

correct phase numbering in test results

parent eaa3da8e
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 25 deletions
mysql-test/r/mysql_upgrade.result
View file @ f91dafc2
Run mysql_upgrade once Run mysql_upgrade once
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -31,13 +32,14 @@ mysql.time_zone_transition_type OK ...@@ -31,13 +32,14 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
Run it again - should say already completed Run it again - should say already completed
This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade
Force should run it regardless of wether it's been run before Force should run it regardless of wether it's been run before
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -68,13 +70,14 @@ mysql.time_zone_transition_type OK ...@@ -68,13 +70,14 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
GRANT ALL ON *.* TO mysqltest1@'%'; GRANT ALL ON *.* TO mysqltest1@'%';
Run mysql_upgrade with password protected account Run mysql_upgrade with password protected account
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -105,7 +108,7 @@ mysql.time_zone_transition_type OK ...@@ -105,7 +108,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
DROP USER mysqltest1@'%'; DROP USER mysqltest1@'%';
Version check failed. Got the following error when calling the 'mysql' command line client Version check failed. Got the following error when calling the 'mysql' command line client
...@@ -115,8 +118,9 @@ Run mysql_upgrade with a non existing server socket ...@@ -115,8 +118,9 @@ Run mysql_upgrade with a non existing server socket
mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
FATAL ERROR: Upgrade failed FATAL ERROR: Upgrade failed
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -147,7 +151,7 @@ mysql.time_zone_transition_type OK ...@@ -147,7 +151,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
set GLOBAL sql_mode=default; set GLOBAL sql_mode=default;
# #
...@@ -158,8 +162,9 @@ CREATE PROCEDURE testproc() BEGIN END; ...@@ -158,8 +162,9 @@ CREATE PROCEDURE testproc() BEGIN END;
UPDATE mysql.proc SET character_set_client = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET character_set_client = NULL WHERE name LIKE 'testproc';
UPDATE mysql.proc SET collation_connection = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET collation_connection = NULL WHERE name LIKE 'testproc';
UPDATE mysql.proc SET db_collation = NULL WHERE name LIKE 'testproc'; UPDATE mysql.proc SET db_collation = NULL WHERE name LIKE 'testproc';
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -190,7 +195,7 @@ mysql.time_zone_transition_type OK ...@@ -190,7 +195,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
CALL testproc(); CALL testproc();
DROP PROCEDURE testproc; DROP PROCEDURE testproc;
...@@ -204,8 +209,9 @@ WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been ...@@ -204,8 +209,9 @@ WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been
GRANT USAGE ON *.* TO 'user3'@'%'; GRANT USAGE ON *.* TO 'user3'@'%';
GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%'; GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
Run mysql_upgrade with all privileges on a user Run mysql_upgrade with all privileges on a user
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -236,7 +242,7 @@ mysql.time_zone_transition_type OK ...@@ -236,7 +242,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
SHOW GRANTS FOR 'user3'@'%'; SHOW GRANTS FOR 'user3'@'%';
Grants for user3@% Grants for user3@%
...@@ -245,7 +251,7 @@ GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%' ...@@ -245,7 +251,7 @@ GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%'
DROP USER 'user3'@'%'; DROP USER 'user3'@'%';
End of 5.1 tests End of 5.1 tests
The --upgrade-system-tables option was used, databases won't be touched. The --upgrade-system-tables option was used, databases won't be touched.
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 1/4: Running 'mysql_fix_privilege_tables'...
OK OK
# #
# Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION # Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION
...@@ -253,8 +259,9 @@ OK ...@@ -253,8 +259,9 @@ OK
# #
# Droping the previously created mysql_upgrade_info file.. # Droping the previously created mysql_upgrade_info file..
# Running mysql_upgrade with --skip-write-binlog.. # Running mysql_upgrade with --skip-write-binlog..
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -285,7 +292,7 @@ mysql.time_zone_transition_type OK ...@@ -285,7 +292,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
# #
# MDEV-4332 Increase username length from 16 characters # MDEV-4332 Increase username length from 16 characters
...@@ -313,8 +320,9 @@ GRANT INSERT ON mysql.user TO very_long_user_name_number_2; ...@@ -313,8 +320,9 @@ GRANT INSERT ON mysql.user TO very_long_user_name_number_2;
GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_1; GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_1;
GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_2; GRANT UPDATE (User) ON mysql.db TO very_long_user_name_number_2;
CREATE PROCEDURE test.pr() BEGIN END; CREATE PROCEDURE test.pr() BEGIN END;
Phase 1/3: Fixing table and database names Phase 1/4: Fixing views - skipped - not required
Phase 2/3: Checking and upgrading tables Phase 2/4: Fixing table and database names
Phase 3/4: Checking and upgrading tables
Processing databases Processing databases
information_schema information_schema
mtr mtr
...@@ -345,7 +353,7 @@ mysql.time_zone_transition_type OK ...@@ -345,7 +353,7 @@ mysql.time_zone_transition_type OK
mysql.user OK mysql.user OK
performance_schema performance_schema
test test
Phase 3/3: Running 'mysql_fix_privilege_tables'... Phase 4/4: Running 'mysql_fix_privilege_tables'...
OK OK
SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr'; SELECT definer FROM mysql.proc WHERE db = 'test' AND name = 'pr';
definer definer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7