From 1e13640f4ddd8909ea7061155c2e62ae5bca88cf Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Wed, 20 Feb 2013 16:34:07 +0400 Subject: [PATCH] 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 --- mysql-test/mysql-test-run.pl | 2 +- mysql-test/suite/connect/suite.opt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b0dca9426ac..38a5bf53f7c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; } diff --git a/mysql-test/suite/connect/suite.opt b/mysql-test/suite/connect/suite.opt index 01416ad2fa4..a67571f52ae 100644 --- a/mysql-test/suite/connect/suite.opt +++ b/mysql-test/suite/connect/suite.opt @@ -1 +1 @@ ---plugin-load-add=$HA_CONNECT_SO --connect=10 +--plugin-load-add=$HA_CONNECT_SO --plugin-connect=ON