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. --- VC++Files/client/mysqldump.vcproj | 27 ++ VC++Files/mysql.sln | 28 +-- VC++Files/sql/mysqld.vcproj | 468 ++++++++++++++++++++++++++++++++++- scripts/make_win_src_distribution.sh | 2 +- sql/event.h | 2 +- sql/event_executor.cc | 2 +- sql/event_timed.cc | 2 +- sql/ha_archive.cc | 2 +- sql/handler.h | 2 +- sql/opt_range.cc | 4 +- sql/set_var.cc | 4 +- sql/sql_partition.cc | 8 +- 12 files changed, 517 insertions(+), 34 deletions(-) diff --git a/VC++Files/client/mysqldump.vcproj b/VC++Files/client/mysqldump.vcproj index b6a33596083..3585374eea5 100644 --- a/VC++Files/client/mysqldump.vcproj +++ b/VC++Files/client/mysqldump.vcproj @@ -226,6 +226,33 @@ PreprocessorDefinitions=""/> + + + + + + + + + + + diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln index 44409aff48c..afe09897ace 100644 --- a/VC++Files/mysql.sln +++ b/VC++Files/mysql.sln @@ -1048,8 +1048,8 @@ Global {44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = TLS|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = TLS_DEBUG|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_DEBUG|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = Debug|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = Debug|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.ActiveCfg = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.Build.0 = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.ActiveCfg = Debug|Win32 @@ -1060,10 +1060,10 @@ Global {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_ProGPL.Build.0 = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.ActiveCfg = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.Build.0 = Release|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.ActiveCfg = TLS|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = TLS|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = TLS|Win32 - {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = TLS|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.ActiveCfg = Max|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = Max|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = Max|Win32 + {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = Max|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.ActiveCfg = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.ActiveCfg = TLS|Win32 @@ -1542,10 +1542,10 @@ Global {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Embedded_ProGPL.Build.0 = Release|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Embedded_Release.ActiveCfg = Release|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Embedded_Release.Build.0 = Release|Win32 - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.ActiveCfg = TLS|Win32 - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.Build.0 = TLS|Win32 - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.ActiveCfg = TLS|Win32 - {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.Build.0 = TLS|Win32 + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.ActiveCfg = Release|Win32 + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.Build.0 = Release|Win32 + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.ActiveCfg = Release|Win32 + {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.Build.0 = Release|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.nt.ActiveCfg = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.nt.Build.0 = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.pro.ActiveCfg = TLS|Win32 @@ -1686,10 +1686,10 @@ Global {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_ProGPL.Build.0 = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Release.ActiveCfg = Release|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Release.Build.0 = Release|Win32 - {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.ActiveCfg = Debug|Win32 - {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.Build.0 = Debug|Win32 - {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.ActiveCfg = Debug|Win32 - {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.Build.0 = Debug|Win32 + {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.ActiveCfg = Release|Win32 + {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.Build.0 = Release|Win32 + {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.ActiveCfg = Release|Win32 + {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.Build.0 = Release|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.ActiveCfg = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.Build.0 = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro.ActiveCfg = Debug|Win32 diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 6002fb5d815..8dc7843b66e 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -25,7 +25,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;LICENSE=Commercial" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;LICENSE=Commercial;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -212,7 +212,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -276,7 +276,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE" + PreprocessorDefinitions="__NT__;DBUG_OFF;NDEBUG;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;LICENSE=Commercial;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -398,7 +398,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE" + PreprocessorDefinitions="MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -460,7 +460,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../regex,../zlib,../extra/yassl/include" - PreprocessorDefinitions="LICENSE=Commercial;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;DBUG_OFF;NDEBUG" + PreprocessorDefinitions="LICENSE=Commercial;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;DBUG_OFF;NDEBUG;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -521,7 +521,7 @@ InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories="../zlib,../include,../regex,../extra/yassl/include" - PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE" + PreprocessorDefinitions="NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_ARCHIVE_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN;WITH_INNOBASE_STORAGE_ENGINE;WITH_ARCHIVE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION" StringPooling="TRUE" RuntimeLibrary="0" EnableFunctionLevelLinking="TRUE" @@ -9137,6 +9137,462 @@ PreprocessorDefinitions=""/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 2f2d6bb393e..12237795a8f 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -249,7 +249,7 @@ copy_dir_dirs() { # Input directories to be copied # -for i in client dbug extra storage/heap include storage/archive \ +for i in client dbug extra storage/heap include storage/archive storage/example \ libmysql libmysqld storage/myisam \ storage/myisammrg mysys regex sql strings sql-common sql/examples \ tools vio zlib diff --git a/sql/event.h b/sql/event.h index 80629fa0a70..c3f3b44d557 100644 --- a/sql/event.h +++ b/sql/event.h @@ -157,7 +157,7 @@ public: update_fields(THD *thd); char * - get_show_create_event(THD *thd, uint *length); + get_show_create_event(THD *thd, uint32 *length); int execute(THD *thd, MEM_ROOT *mem_root= NULL); diff --git a/sql/event_executor.cc b/sql/event_executor.cc index 4eb92f9e430..7a74a81e9fa 100644 --- a/sql/event_executor.cc +++ b/sql/event_executor.cc @@ -460,7 +460,7 @@ event_executor_worker(void *event_void) thd->thread_stack = (char*)&thd; // remember where our stack is thd->mem_root= &worker_mem_root; - pthread_detach(pthread_self()); + pthread_detach_this_thread(); if (init_event_thread(thd)) goto err; diff --git a/sql/event_timed.cc b/sql/event_timed.cc index 3b59bb33596..cce96f93b90 100644 --- a/sql/event_timed.cc +++ b/sql/event_timed.cc @@ -934,7 +934,7 @@ done: char * -event_timed::get_show_create_event(THD *thd, uint *length) +event_timed::get_show_create_event(THD *thd, uint32 *length) { char *dst, *ret; uint len, tmp_len; diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index 06130f31504..65049bac135 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -801,7 +801,7 @@ int ha_archive::write_row(byte *buf) error: pthread_mutex_unlock(&share->mutex); if (read_buf) - my_free(read_buf, MYF(0)); + my_free((gptr) read_buf, MYF(0)); DBUG_RETURN(rc); } diff --git a/sql/handler.h b/sql/handler.h index 43495b46cce..17131ee556c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -795,7 +795,7 @@ typedef struct st_partition_iter typedef int (*get_partitions_in_range_iter)(partition_info *part_info, bool is_subpart, - byte *min_val, byte *max_val, + char *min_val, char *max_val, uint flags, PARTITION_ITERATOR *part_iter); diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 96e73dc465a..db228f076ca 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -338,8 +338,8 @@ public: */ if (min_flag || max_flag) return FALSE; - byte *min_val= min_value; - byte *max_val= min_value; + byte *min_val= (byte *)min_value; + byte *max_val= (byte *)min_value; if (maybe_null) { diff --git a/sql/set_var.cc b/sql/set_var.cc index b85b2576b83..1a86cd1aef7 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -109,7 +109,7 @@ extern ulong ndb_report_thresh_binlog_mem_usage; -extern my_bool event_executor_running_global_var; +extern volatile my_bool event_executor_running_global_var; static HASH system_variable_hash; const char *bool_type_names[]= { "OFF", "ON", NullS }; @@ -216,7 +216,7 @@ sys_var_long_ptr sys_delayed_insert_timeout("delayed_insert_timeout", sys_var_long_ptr sys_delayed_queue_size("delayed_queue_size", &delayed_queue_size); sys_var_event_executor sys_event_executor("event_scheduler", - &event_executor_running_global_var); + (my_bool *)&event_executor_running_global_var); sys_var_long_ptr sys_expire_logs_days("expire_logs_days", &expire_logs_days); sys_var_bool_ptr sys_flush("flush", &myisam_flush); 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