database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

workaround for a test failure on windows (by serg)

Browse Source
This commit is contained in:
Vladislav Vaintroub
2017-06-22 19:28:07 +00:00
parent 9b7afd4188
commit f65d6a03f0
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/mysqld--help.result
View File

@ -1,3 +1,4 @@
Windows bug: happens when a new line is exactly at the right offset
The following options may be given as the first argument: The following options may be given as the first argument:
--print-defaults Print the program argument list and exit. --print-defaults Print the program argument list and exit.
--no-defaults Don't read default options from any option file. --no-defaults Don't read default options from any option file.

1
mysql-test/t/mysqld--help.test
View File

@ -42,6 +42,7 @@ perl;
$re2=join('|', @plugins); $re2=join('|', @plugins);
$skip=0; $skip=0;
open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die; open(F, '<', "$ENV{MYSQL_TMP_DIR}/mysqld--help.txt") or die;
print "Windows bug: happens when a new line is exactly at the right offset\n";
while (<F>) { while (<F>) {
next if 1../The following groups are read/; next if 1../The following groups are read/;
# formatting, skip line consisting entirely of dashes and blanks # formatting, skip line consisting entirely of dashes and blanks