diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-25 14:28:30 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-25 14:28:30 +0500 |
commit | 7a310d32344d97b265bfffdc89897b6727e45b97 (patch) | |
tree | 92ebe1a8c370f4ac63a8cf0804e3d98447a08cf3 /sql/sql_partition.h | |
parent | 475a08a2f77092781539fc013255f0aab62ca5dd (diff) | |
parent | 50563d39309ba82448a31f6a98e40181422f5147 (diff) | |
download | mariadb-git-7a310d32344d97b265bfffdc89897b6727e45b97.tar.gz |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/27084/my51-27084
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_partition.h:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/partition.result:
merging
mysql-test/t/partition.test:
merging
sql/sql_partition.cc:
SCCS merged
Diffstat (limited to 'sql/sql_partition.h')
-rw-r--r-- | sql/sql_partition.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index d0c66083768..56f24181b93 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -81,7 +81,8 @@ bool mysql_unpack_partition(THD *thd, const char *part_buf, uint part_info_len, const char *part_state, uint part_state_len, TABLE *table, bool is_create_table_ind, - handlerton *default_db_type); + handlerton *default_db_type, + bool *work_part_info_used); void make_used_partitions_str(partition_info *part_info, String *parts_str); uint32 get_list_array_idx_for_endpoint(partition_info *part_info, bool left_endpoint, |