diff options
| author | Monty <monty@mariadb.org> | 2014-12-22 16:53:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:17 +0100 |
| commit | d7d589dc01f6d70d1518b74d46fd3b75e76267f5 (patch) | |
| tree | f9df59951453660f0038ed78cf5ceadc852bf74c /mysys/my_default.c | |
| parent | 3a3ec744b5a31318a00821dc0ed6da8af49fda25 (diff) | |
| download | mariadb-git-d7d589dc01f6d70d1518b74d46fd3b75e76267f5.tar.gz | |
Push for testing of encryption
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index 87258a3b27e..e40e24fd5bc 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -102,8 +102,7 @@ static const char *f_extensions[]= { ".cnf", 0 }; #define NEWLINE "\n" #endif -static int handle_default_option(void *in_ctx, const char *group_name, - const char *option); +static int handle_default_option(void *, const char *, const char *); /* This structure defines the context that we pass to callback @@ -917,7 +916,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler, end= remove_end_comment(ptr); if ((value= strchr(ptr, '='))) - end= value; /* Option without argument */ + end= value; for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ; if (!value) { |