diff --git a/VC++Files/client/mysqldump.vcproj b/VC++Files/client/mysqldump.vcproj
index 39b83fd46f3..3585374eea5 100644
--- a/VC++Files/client/mysqldump.vcproj
+++ b/VC++Files/client/mysqldump.vcproj
@@ -227,7 +227,7 @@
+ RelativePath="..\sql-common\my_user.c">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 6ee9cea25ac..3d00ca388b9 100644
--- a/sql/event.h
+++ b/sql/event.h
@@ -177,7 +177,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 dbbff2a8c58..7960f1e1758 100644
--- a/sql/event_executor.cc
+++ b/sql/event_executor.cc
@@ -461,7 +461,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 0be3f32e854..28d21089b74 100644
--- a/sql/event_timed.cc
+++ b/sql/event_timed.cc
@@ -952,7 +952,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 d29c499f954..056abfbf7a5 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -794,7 +794,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 1b3a4a6506f..9e20fa28239 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 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)
{