diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
| commit | 7ca49db57cc4b1831587b764c3a1beb086a90f0c (patch) | |
| tree | bcf5936909c9a45ffd35c91138ff74a53a585496 /sql/create_options.cc | |
| parent | 9ae909643d2819fe139e389ca60f9f3076b37861 (diff) | |
| parent | 37155bf74a29a57829cc13947ac346b0f2c8fd28 (diff) | |
| download | mariadb-git-7ca49db57cc4b1831587b764c3a1beb086a90f0c.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/create_options.cc')
| -rw-r--r-- | sql/create_options.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc index 42c69436897..25e35a1f218 100644 --- a/sql/create_options.cc +++ b/sql/create_options.cc @@ -138,8 +138,8 @@ static bool set_one_value(ha_create_table_option *opt, my_option optp= { opt->name, 1, 0, (uchar **)val, 0, 0, GET_ULL, - REQUIRED_ARG, opt->def_value, opt->min_value, opt->max_value, - 0, (long) opt->block_size, 0}; + REQUIRED_ARG, (longlong)opt->def_value, (longlong)opt->min_value, + opt->max_value, 0, (long) opt->block_size, 0}; ulonglong orig_val= strtoull(value->str, NULL, 10); my_bool unused; |