diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-23 19:22:38 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-23 19:22:38 +0200 |
| commit | eaed26053da306109d93cbce42b3d275c3e62471 (patch) | |
| tree | 8055d6ee835d938d153d0b66caa2bfd55f120ca8 /tests | |
| parent | 3e46f488e5034da1557b2d6c18442dd9fdb40138 (diff) | |
| parent | 7de98f2ffbb273b105321fc88bf536a1fd55114a (diff) | |
| download | mariadb-git-eaed26053da306109d93cbce42b3d275c3e62471.tar.gz | |
Merge with base 5.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 3 | ||||
| -rw-r--r-- | tests/thread_test.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index d1224a7f724..759eac04fa3 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18446,7 +18446,8 @@ static void test_bug47485() Read and parse arguments and MySQL options from my.cnf */ -static const char *client_test_load_default_groups[]= { "client", 0 }; +static const char *client_test_load_default_groups[]= +{ "client", "client-server", "client-mariadb", 0 }; static char **defaults_argv; static struct my_option client_test_long_options[] = diff --git a/tests/thread_test.c b/tests/thread_test.c index 8e1c58ebbec..0944cbc0970 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -123,7 +123,8 @@ static struct my_option my_long_options[] = }; -static const char *load_default_groups[]= { "client",0 }; +static const char *load_default_groups[]= +{ "client", "client-server", "client-mariadb", 0 }; static void usage() { |