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 /client/mysqldump.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 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index aa81a0e98bf..4e39612b38d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -808,7 +808,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), &err_ptr, &err_len); if (err_len) { - strmake(buff, err_ptr, min(sizeof(buff), err_len)); + strmake(buff, err_ptr, min(sizeof(buff) - 1, err_len)); fprintf(stderr, "Invalid mode to --compatible: %s\n", buff); exit(1); } @@ -4452,7 +4452,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length, for (; pos != end && *pos != ','; pos++) ; var_len= (uint) (pos - start); - strmake(buff, start, min(sizeof(buff), var_len)); + strmake(buff, start, min(sizeof(buff) - 1, var_len)); find= find_type(buff, lib, var_len); if (!find) { |