diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-24 10:56:13 +0300 |
| commit | 0ae23cd69d3c13dba2a73750e93abf3342f21eb4 (patch) | |
| tree | 27d736b66dbef96f0119023bc78b639f7a59faaa /mysys/default.c | |
| parent | 6e9dad7e67e377ce14bc528c614d6ff7491235d0 (diff) | |
| parent | f6a8efbea3f8572c72066343b58ba88e679edc2c (diff) | |
| download | mariadb-git-0ae23cd69d3c13dba2a73750e93abf3342f21eb4.tar.gz | |
Auto-merge from mysql-trunk-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 8c7dfe12047..4a0f1c6f009 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -683,7 +683,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; |