diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
| commit | 26f1a8ead26e632df20fa03f3a421aa1b37774da (patch) | |
| tree | 8cb3e4210dd5da0c3cec217f0e5008ee9104715b /mysys/default.c | |
| parent | 5f3b645b1e8568e42358be5bc327920ad3b57c97 (diff) | |
| parent | b9380f0e76b34af223c4ef0b4fe648ddca47a59c (diff) | |
| download | mariadb-git-26f1a8ead26e632df20fa03f3a421aa1b37774da.tar.gz | |
Manual merge.
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 1c021b4584f..4e9d4faae91 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -650,7 +650,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler, int recursion_level) { char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext; - char *value, option[4096], tmp[FN_REFLEN]; + char *value, option[4096+2], tmp[FN_REFLEN]; static const char includedir_keyword[]= "includedir"; static const char include_keyword[]= "include"; const int max_recursion_level= 10; |