diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
| commit | 6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f (patch) | |
| tree | c02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /sql/partition_info.cc | |
| parent | 8d407c5f704c523205d52eabd89ca7fd366cf6eb (diff) | |
| parent | c96b249fc3912f7a86f885cc62da1a3eeed537c6 (diff) | |
| download | mariadb-git-6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 43934551016..caf28fdd83e 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1535,13 +1535,11 @@ bool partition_info::set_up_charset_field_preps() i= 0; while ((field= *(ptr++))) { - CHARSET_INFO *cs; uchar *field_buf; LINT_INIT(field_buf); if (!field_is_partition_charset(field)) continue; - cs= ((Field_str*)field)->charset(); size= field->pack_length(); if (!(field_buf= (uchar*) sql_calloc(size))) goto error; |