From ab88a598cac2fab475f18bda52cf73a2c557ed52 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Jan 2006 13:09:08 +0100 Subject: Windows compile fixes in preparation for 5.1.6 beta. VC++Files/client/mysqldump.vcproj: Add missing source file. VC++Files/mysql.sln: Fix configuration mismatch. VC++Files/sql/mysqld.vcproj: Enable row-based replication. Add missing source files. scripts/make_win_src_distribution.sh: Add copying of missing directory. sql/event.h: Fix type conflict only visible on Windows. sql/event_executor.cc: Fix non-portable thread stuff. sql/event_timed.cc: Fix type conflict only visible on Windows. sql/ha_archive.cc: Add cast needed for Windows. sql/handler.h: Fix Windows byte * <-> char * mismatch. sql/opt_range.cc: Fix Windows byte * <-> char * mismatch. sql/set_var.cc: BUG#16811 Fix Windows compilation by making the cast-away of volatile implicit (Windows linker does not like volatile <-> non-volatile mismatch, in contrast to Unix) sql/sql_partition.cc: Fix Windows byte * <-> char * mismatch. --- sql/sql_partition.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sql/sql_partition.cc') diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 52d2d61e843..6c4e1eddbfb 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); @@ -5731,7 +5731,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) { @@ -5847,7 +5847,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) { -- cgit v1.2.1