diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 711c318c072f6d5fd5c2877ccc736c7673d1711d (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /tests | |
| parent | 00538253b592522babe3609af29cb3eb87218b64 (diff) | |
| parent | fd64a0db45705ca5eb2ad34ffc2ed1d9ef961017 (diff) | |
| download | mariadb-git-711c318c072f6d5fd5c2877ccc736c7673d1711d.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 | ||||
| -rw-r--r-- | tests/thread_test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 798941c8988..a3640077889 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -19577,7 +19577,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), if (argument) { char *start=argument; - my_free(opt_password, MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_password); opt_password= my_strdup(argument, MYF(MY_FAE)); while (*argument) *argument++= 'x'; /* Destroy argument */ if (*start) @@ -19734,7 +19734,7 @@ int main(int argc, char **argv) print_test_output(); while (embedded_server_arg_count > 1) - my_free(embedded_server_args[--embedded_server_arg_count],MYF(0)); + my_free(embedded_server_args[--embedded_server_arg_count]); mysql_server_end(); diff --git a/tests/thread_test.c b/tests/thread_test.c index def133f4a3f..1a3dd60c1fd 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -150,7 +150,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), case 'p': if (argument) { - my_free(password, MYF(MY_ALLOW_ZERO_PTR)); + my_free(password); password= my_strdup(argument, MYF(MY_FAE)); while (*argument) *argument++= 'x'; /* Destroy argument */ } |