diff options
| author | unknown <knielsen@mysql.com> | 2006-01-30 17:57:20 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-30 17:57:20 +0100 |
| commit | c4f91d17b71127c53c07c638706aa67d97d617f3 (patch) | |
| tree | e5595c167d68209e7b4e65ebcb97053551b308a5 /sql/sql_partition.cc | |
| parent | 8a78ab057e64d41cb02d1a706b77e739298b8df4 (diff) | |
| parent | e65d02e005fce8ec543a64e802272c3c9ba877b9 (diff) | |
| download | mariadb-git-c4f91d17b71127c53c07c638706aa67d97d617f3.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
into mysql.com:/usr/local/mysql/x/mysql-5.1-new
VC++Files/sql/mysqld.vcproj:
Auto merged
sql/event.h:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
VC++Files/client/mysqldump.vcproj:
Manual merge.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index c29f5ef5650..aec0d2108ed 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -116,12 +116,12 @@ uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter); uint32 get_next_partition_id_list(PARTITION_ITERATOR* part_iter); int get_part_iter_for_interval_via_mapping(partition_info *part_info, bool is_subpart, - byte *min_value, byte *max_value, + char *min_value, char *max_value, uint flags, PARTITION_ITERATOR *part_iter); int get_part_iter_for_interval_via_walking(partition_info *part_info, bool is_subpart, - byte *min_value, byte *max_value, + char *min_value, char *max_value, uint flags, PARTITION_ITERATOR *part_iter); static void set_up_range_analysis_info(partition_info *part_info); @@ -5729,7 +5729,7 @@ typedef uint32 (*get_endpoint_func)(partition_info*, bool left_endpoint, int get_part_iter_for_interval_via_mapping(partition_info *part_info, bool is_subpart, - byte *min_value, byte *max_value, + char *min_value, char *max_value, uint flags, PARTITION_ITERATOR *part_iter) { @@ -5845,7 +5845,7 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info, int get_part_iter_for_interval_via_walking(partition_info *part_info, bool is_subpart, - byte *min_value, byte *max_value, + char *min_value, char *max_value, uint flags, PARTITION_ITERATOR *part_iter) { |