diff options
| author | <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
| commit | c61ce4143c144765e4134490adc1e18f4cc600fc (patch) | |
| tree | 1cb3a7a9fbd34fa79c77f469bbe557f689c64a68 /sql/sql_partition.cc | |
| parent | a0d5be1fd3d23174b62bafbb3ea838d4799fcdc4 (diff) | |
| parent | 2ad690fdf8a1141be8439a7e2d53974a0d3ec923 (diff) | |
| download | mariadb-git-c61ce4143c144765e4134490adc1e18f4cc600fc.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 49f972f35ca..ed6d3af2e43 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4183,7 +4183,7 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index, */ bool mysql_unpack_partition(THD *thd, - const char *part_buf, uint part_info_len, + char *part_buf, uint part_info_len, TABLE* table, bool is_create_table_ind, handlerton *default_db_type, bool *work_part_info_used) |