mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge next-mr -> next-4284.

Browse source
This commit is contained in:
Konstantin Osipov 2009-12-15 22:59:07 +03:00
commit 391b5246fe
69 changed files with 951 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/mysql_client_test.c
View file

@ -19379,7 +19379,9 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);
load_defaults("my", client_test_load_default_groups, &argc, &argv);
if (load_defaults("my", client_test_load_default_groups, &argc, &argv))
exit(1);
defaults_argv= argv;
get_options(&argc, &argv);

5
tests/thread_test.c
View file

@ -176,9 +176,8 @@ static void get_options(int argc, char **argv)
{
int ho_error;
load_defaults("my",load_default_groups,&argc,&argv);
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
if ((ho_error= load_defaults("my",load_default_groups,&argc,&argv)) ||
(ho_error= handle_options(&argc, &argv, my_long_options, get_one_option)))
exit(ho_error);
free_defaults(argv);