diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
commit | 6edd76785c2fff55f1869ef816da13a8bab6151d (patch) | |
tree | c987eb9a81d19b6544fc6688632bedd80f7622d1 /sql/partition_info.cc | |
parent | 0e007344eae972b9be7d88ca43373cb33662ac1c (diff) | |
parent | 11400de10cdfa9047904539fb9e7fbff611d9391 (diff) | |
download | mariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz |
merge
Diffstat (limited to 'sql/partition_info.cc')
-rw-r--r-- | sql/partition_info.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index e62b895a839..7c8a520879f 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -2088,7 +2088,7 @@ bool partition_info::fix_column_value_functions(THD *thd, { uchar *val_ptr; uint len= field->pack_length(); - ulong save_sql_mode; + ulonglong save_sql_mode; bool save_got_warning; if (!(column_item= get_column_item(column_item, |