summaryrefslogtreecommitdiff
path: root/sql/sql_partition.h
diff options
context:
space:
mode:
authorunknown <Li-Bing.Song@sun.com>2010-07-29 11:24:35 +0800
committerunknown <Li-Bing.Song@sun.com>2010-07-29 11:24:35 +0800
commitcb63e6d0214a2542fbb774c279af1a32abba68dd (patch)
tree1cb3a7a9fbd34fa79c77f469bbe557f689c64a68 /sql/sql_partition.h
parentb0b0d055ee6e5229e7e9733e0f59cf31d96f614c (diff)
parent2124538d9cea1cea39b01f0b8b99052b36004fb9 (diff)
downloadmariadb-git-cb63e6d0214a2542fbb774c279af1a32abba68dd.tar.gz
Manual merge
Diffstat (limited to 'sql/sql_partition.h')
-rw-r--r--sql/sql_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index 2e0ea740555..c644e63794c 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -110,7 +110,7 @@ void get_full_part_id_from_key(const TABLE *table, uchar *buf,
KEY *key_info,
const key_range *key_spec,
part_id_range *part_spec);
-bool mysql_unpack_partition(THD *thd, const char *part_buf,
+bool mysql_unpack_partition(THD *thd, char *part_buf,
uint part_info_len,
TABLE *table, bool is_create_table_ind,
handlerton *default_db_type,