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

Fixing problems with running tests caused by the fact that

"mysqld --connect" conflicts with "mysqld --connect-timeout".

(unfortunate design decision in how mysqld handles command line options).

modified:
  mysql-test/mysql-test-run.pl
  mysql-test/suite/connect/suite.opt
This commit is contained in:
Alexander Barkov
2013-02-20 16:34:07 +04:00
parent ea0e250669
commit 1e13640f4d
2 changed files with 2 additions and 2 deletions

View File

@ -1925,7 +1925,7 @@ sub collect_mysqld_features {
# here we want to detect all not mandatory plugins
# they are listed in the --help output as
# --archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON, OFF, FORCE (don't start if the plugin fails to load).
push @optional_plugins, $1
push @optional_plugins, "plugin-$1"
if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. Possible values are ON, OFF, FORCE/;
next;
}