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

Fixing problems with running tests caused by the fact that

Browse Source 
"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
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@@ -1925,7 +1925,7 @@ sub collect_mysqld_features {
# here we want to detect all not mandatory plugins # here we want to detect all not mandatory plugins
# they are listed in the --help output as # 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). # --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/; if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. Possible values are ON, OFF, FORCE/;
next; next;
} }

2
mysql-test/suite/connect/suite.opt
View File

@@ -1 +1 @@
--plugin-load-add=$HA_CONNECT_SO --connect=10 --plugin-load-add=$HA_CONNECT_SO --plugin-connect=ON