mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
This commit is contained in:
unknown 2007-04-19 21:35:26 +02:00
commit b7c4654816
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/mysql_upgrade.result
View file

@ -76,5 +76,5 @@ 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' (1) when trying to connect
mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
FATAL ERROR: Upgrade failed

2
mysql-test/t/mysql_upgrade.test
View file

@ -52,6 +52,6 @@ DROP USER mysqltest1@'%';
--echo Run mysql_upgrade with a non existing server socket
--replace_result $MYSQLTEST_VARDIR var
--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/
--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/ /\([0-9]*\)/(errno)/
--error 1
--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1