diff options
| author | unknown <brian@zim.(none)> | 2006-08-25 14:07:30 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-25 14:07:30 -0700 |
| commit | e454fb0c9dd768ff7198d177253d9e6fe95511b2 (patch) | |
| tree | f2bea38f12b4ec4b52b8886dacb59249b306d9f7 /server-tools | |
| parent | 43dbfa66c5cf2c777af7c70eb121c4749e9a30aa (diff) | |
| parent | 9f9c3364cb71928633a120bf5548f358274f9da2 (diff) | |
| download | mariadb-git-e454fb0c9dd768ff7198d177253d9e6fe95511b2.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/arch-5.1
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
BUILD/compile-dist:
Auto merged
BUILD/compile-ia64-debug-max:
Auto merged
CMakeLists.txt:
Auto merged
client/mysql.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
BUILD/FINISH.sh:
Innodbase config still needed.
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; } |