database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

mysql_upgrade portability fixes

Browse Source 
client/mysql_upgrade.c:
  Add defines for WEXITSTATUS
  Pass arguments on command line instead of --defaults-file=<temp file>
mysql-test/r/mysql_upgrade.result:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
mysql-test/t/mysql_upgrade.test:
  When testing that mysql_upgrade detect if mysqlcheck fails, use an option that
  is used on all platforms.
scripts/comp_sql.c:
  Some compilers have a max string length, insert a newline at
  every 512th char in long strings
This commit is contained in:
unknown
2007-04-19 21:30:46 +02:00
parent ffd062f7c7
commit 36cd228af1
4 changed files with 46 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,5 +58,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: 2002: Can't connect to local MySQL server through socket 'var/tmp/no_sock_here' (2) when trying to connect
mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (1) when trying to connect
FATAL ERROR: Upgrade failed

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

@ -58,4 +58,4 @@ DROP USER mysqltest1@'%';
--replace_result $MYSQLTEST_VARDIR var
--replace_regex /.*mysqlcheck.*: Got/mysqlcheck: Got/
--error 1
--exec $MYSQL_UPGRADE --skip-verbose --force --socket=$MYSQLTEST_VARDIR/tmp/no_sock_here 2>&1
--exec $MYSQL_UPGRADE --skip-verbose --force --host=not_existing_host 2>&1