diff options
| author | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-08-25 14:07:30 -0700 |
| commit | 7216b5bc7a64533634b234f521ee8ce9bf7c9417 (patch) | |
| tree | f2bea38f12b4ec4b52b8886dacb59249b306d9f7 /server-tools | |
| parent | 257ce16d58c5f375ca026cf05f97d5ded77851eb (diff) | |
| parent | e831273902da0af8d48eab4b76a7c77a06fbc1aa (diff) | |
| download | mariadb-git-7216b5bc7a64533634b234f521ee8ce9bf7c9417.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/arch-5.1
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc index 4e931488fce..d69fb1cecec 100644 --- a/server-tools/instance-manager/parse.cc +++ b/server-tools/instance-manager/parse.cc @@ -152,7 +152,7 @@ static bool parse_long(const LEX_STRING *token, long *value) int err_code; char *end_ptr= token->str + token->length; - *value= my_strtoll10(token->str, &end_ptr, &err_code); + *value= (long)my_strtoll10(token->str, &end_ptr, &err_code); return err_code != 0; } |