mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Post-merge fixes to fix test cases.
mysql-test/extra/rpl_tests/rpl_log.test: Using RESET MASTER in the middle of a sequence of statements cause a race condition between the dump thread sending the preceeding statements to the slave and the RESET MASTER. mysql-test/suite/federated/federated.test: Fixing include paths. mysql-test/suite/federated/federated_bug_25714.test: Removing extreneous lines added by merge. mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test: Correcting typo (the spaces following the connection name was included as part of the name). mysql-test/t/distinct.test: Correcting paths.
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
Run mysql_upgrade once
|
||||
mtr.global_suppressions OK
|
||||
mtr.global_supressions OK
|
||||
mtr.suspicious_patterns OK
|
||||
mtr.test_suppressions OK
|
||||
mtr.test_supressions OK
|
||||
mysql.columns_priv OK
|
||||
mysql.db OK
|
||||
mysql.event OK
|
||||
@ -32,9 +32,9 @@ mysql.user OK
|
||||
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
|
||||
Force should run it regardless of wether it's been run before
|
||||
mtr.global_suppressions OK
|
||||
mtr.global_supressions OK
|
||||
mtr.suspicious_patterns OK
|
||||
mtr.test_suppressions OK
|
||||
mtr.test_supressions OK
|
||||
mysql.columns_priv OK
|
||||
mysql.db OK
|
||||
mysql.event OK
|
||||
@ -65,9 +65,9 @@ mysql.user OK
|
||||
CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila';
|
||||
GRANT ALL ON *.* TO mysqltest1@'%';
|
||||
Run mysql_upgrade with password protected account
|
||||
mtr.global_suppressions OK
|
||||
mtr.global_supressions OK
|
||||
mtr.suspicious_patterns OK
|
||||
mtr.test_suppressions OK
|
||||
mtr.test_supressions OK
|
||||
mysql.columns_priv OK
|
||||
mysql.db OK
|
||||
mysql.event OK
|
||||
@ -97,12 +97,12 @@ mysql.time_zone_transition_type OK
|
||||
mysql.user OK
|
||||
DROP USER mysqltest1@'%';
|
||||
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: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect
|
||||
FATAL ERROR: Upgrade failed
|
||||
set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
|
||||
mtr.global_suppressions OK
|
||||
mtr.global_supressions OK
|
||||
mtr.suspicious_patterns OK
|
||||
mtr.test_suppressions OK
|
||||
mtr.test_supressions OK
|
||||
mysql.columns_priv OK
|
||||
mysql.db OK
|
||||
mysql.event OK
|
||||
|
Reference in New Issue
Block a user