diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
| commit | 930a08784c6bf32090d88783619a4c0485ce8cf9 (patch) | |
| tree | 1552ff636d911fe038d671ee60e55406bdadbf35 /mysys/default.c | |
| parent | 8933c6f5f431e06046a8c4f635ae2a366fbc8da8 (diff) | |
| parent | 27aba1b56914694ed8e5615f67dc397680842341 (diff) | |
| download | mariadb-git-930a08784c6bf32090d88783619a4c0485ce8cf9.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Conflict adding files to server-tools. Created directory.
Conflict because server-tools is not versioned, but has versioned children. Versioned directory.
Conflict adding files to server-tools/instance-manager. Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children. Versioned directory.
Contents conflict in server-tools/instance-manager/instance_map.cc
Contents conflict in server-tools/instance-manager/listener.cc
Contents conflict in server-tools/instance-manager/options.cc
Contents conflict in server-tools/instance-manager/user_map.cc
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 6468cf2b35d..91a2728d009 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -679,7 +679,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; |