Commit 2b9354c6 authored by kent@mysql.com's avatar kent@mysql.com

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents f49ac24a 2930a466
...@@ -773,14 +773,10 @@ InitConfigFileParser::parse_mycnf() ...@@ -773,14 +773,10 @@ InitConfigFileParser::parse_mycnf()
case ConfigInfo::CI_INT: case ConfigInfo::CI_INT:
opt.value = (gptr*)malloc(sizeof(int)); opt.value = (gptr*)malloc(sizeof(int));
opt.var_type = GET_INT; opt.var_type = GET_INT;
require(convertStringToUint64(param._min, (Uint64&)opt.min_value));
require(convertStringToUint64(param._max, (Uint64&)opt.max_value));
break; break;
case ConfigInfo::CI_INT64: case ConfigInfo::CI_INT64:
opt.value = (gptr*)malloc(sizeof(Int64)); opt.value = (gptr*)malloc(sizeof(Int64));
opt.var_type = GET_LL; opt.var_type = GET_LL;
require(convertStringToUint64(param._min, (Uint64&)opt.min_value));
require(convertStringToUint64(param._max, (Uint64&)opt.max_value));
break; break;
case ConfigInfo::CI_STRING: case ConfigInfo::CI_STRING:
opt.value = (gptr*)malloc(sizeof(char *)); opt.value = (gptr*)malloc(sizeof(char *));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment