Skip to content

M
mariadb
Commit 56d44ff1 authored by knielsen@mysql.com's avatar knielsen@mysql.com
Browse files
Options

Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes 

into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
parents 854899a2 2aea45b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 37 deletions
VC++Files/client/mysqldump.vcproj
View file @ 56d44ff1
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="my_user.c"> RelativePath="..\sql-common\my_user.c">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
<Tool <Tool
......
VC++Files/client/mysqlslap.vcproj
View file @ 56d44ff1
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysqlslap.exe" OutputFile="../client_release/mysqlslap.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysqlslap.exe" OutputFile="../client_classic/mysqlslap.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
......
VC++Files/mysql.sln
View file @ 56d44ff1
...@@ -1048,8 +1048,8 @@ Global ...@@ -1048,8 +1048,8 @@ Global
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic.Build.0 = TLS|Win32 {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.ActiveCfg = TLS|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = 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.ActiveCfg = Debug|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_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.ActiveCfg = Release|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.Build.0 = Release|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.Build.0 = Release|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.ActiveCfg = Debug|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.ActiveCfg = Debug|Win32
...@@ -1060,10 +1060,10 @@ Global ...@@ -1060,10 +1060,10 @@ Global
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_ProGPL.Build.0 = Release|Win32 {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.ActiveCfg = Release|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Release.Build.0 = 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.ActiveCfg = Max|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max.Build.0 = Max|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.ActiveCfg = Max|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Max nt.Build.0 = TLS|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.ActiveCfg = TLS|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.nt.Build.0 = TLS|Win32
{44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.ActiveCfg = TLS|Win32 {44D9C7DC-6636-4B82-BD01-6876C64017DF}.pro.ActiveCfg = TLS|Win32
...@@ -1542,10 +1542,10 @@ Global ...@@ -1542,10 +1542,10 @@ Global
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Embedded_ProGPL.Build.0 = Release|Win32 {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.ActiveCfg = Release|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Embedded_Release.Build.0 = 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.ActiveCfg = Release|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.Build.0 = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max.Build.0 = Release|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.ActiveCfg = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.ActiveCfg = Release|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.Max nt.Build.0 = TLS|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.ActiveCfg = TLS|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.nt.Build.0 = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.nt.Build.0 = TLS|Win32
{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.pro.ActiveCfg = TLS|Win32 {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}.pro.ActiveCfg = TLS|Win32
...@@ -1686,10 +1686,10 @@ Global ...@@ -1686,10 +1686,10 @@ Global
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_ProGPL.Build.0 = Debug|Win32 {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.ActiveCfg = Release|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Release.Build.0 = 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.ActiveCfg = Release|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.Build.0 = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.Build.0 = Release|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.ActiveCfg = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.ActiveCfg = Release|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.Build.0 = Debug|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.ActiveCfg = Debug|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.Build.0 = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.Build.0 = Debug|Win32
{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro.ActiveCfg = Debug|Win32 {2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro.ActiveCfg = Debug|Win32
......
VC++Files/sql/mysqld.vcproj
View file @ 56d44ff1
This diff is collapsed.
scripts/make_win_src_distribution.sh
View file @ 56d44ff1
...@@ -249,7 +249,7 @@ copy_dir_dirs() { ...@@ -249,7 +249,7 @@ copy_dir_dirs() {
# Input directories to be copied # 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 \ libmysql libmysqld storage/myisam \
storage/myisammrg mysys regex sql strings sql-common sql/examples \ storage/myisammrg mysys regex sql strings sql-common sql/examples \
tools vio zlib tools vio zlib
......
sql/event.h
View file @ 56d44ff1
...@@ -177,7 +177,7 @@ public: ...@@ -177,7 +177,7 @@ public:
update_fields(THD *thd); update_fields(THD *thd);
char * char *
get_show_create_event(THD *thd, uint *length); get_show_create_event(THD *thd, uint32 *length);
int int
execute(THD *thd, MEM_ROOT *mem_root= NULL); execute(THD *thd, MEM_ROOT *mem_root= NULL);
......
sql/event_executor.cc
View file @ 56d44ff1
...@@ -461,7 +461,7 @@ event_executor_worker(void *event_void) ...@@ -461,7 +461,7 @@ event_executor_worker(void *event_void)
thd->thread_stack = (char*)&thd; // remember where our stack is thd->thread_stack = (char*)&thd; // remember where our stack is
thd->mem_root= &worker_mem_root; thd->mem_root= &worker_mem_root;
pthread_detach(pthread_self()); pthread_detach_this_thread();
if (init_event_thread(thd)) if (init_event_thread(thd))
goto err; goto err;
......
sql/event_timed.cc
View file @ 56d44ff1
...@@ -952,7 +952,7 @@ done: ...@@ -952,7 +952,7 @@ done:
char * char *
event_timed::get_show_create_event(THD *thd, uint *length) event_timed::get_show_create_event(THD *thd, uint32 *length)
{ {
char *dst, *ret; char *dst, *ret;
uint len, tmp_len; uint len, tmp_len;
......
sql/ha_archive.cc
View file @ 56d44ff1
...@@ -801,7 +801,7 @@ int ha_archive::write_row(byte *buf) ...@@ -801,7 +801,7 @@ int ha_archive::write_row(byte *buf)
error: error:
pthread_mutex_unlock(&share->mutex); pthread_mutex_unlock(&share->mutex);
if (read_buf) if (read_buf)
my_free(read_buf, MYF(0)); my_free((gptr) read_buf, MYF(0));
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }
......
sql/handler.h
View file @ 56d44ff1
...@@ -794,7 +794,7 @@ typedef struct st_partition_iter ...@@ -794,7 +794,7 @@ typedef struct st_partition_iter
typedef int (*get_partitions_in_range_iter)(partition_info *part_info, typedef int (*get_partitions_in_range_iter)(partition_info *part_info,
bool is_subpart, bool is_subpart,
byte *min_val, byte *max_val, char *min_val, char *max_val,
uint flags, uint flags,
PARTITION_ITERATOR *part_iter); PARTITION_ITERATOR *part_iter);
......
sql/opt_range.cc
View file @ 56d44ff1
...@@ -338,8 +338,8 @@ public: ...@@ -338,8 +338,8 @@ public:
*/ */
if (min_flag || max_flag) if (min_flag || max_flag)
return FALSE; return FALSE;
byte *min_val= min_value; byte *min_val= (byte *)min_value;
byte *max_val= min_value; byte *max_val= (byte *)min_value;
if (maybe_null) if (maybe_null)
{ {
......
sql/set_var.cc
View file @ 56d44ff1
...@@ -109,7 +109,7 @@ extern ulong ndb_report_thresh_binlog_mem_usage; ...@@ -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; static HASH system_variable_hash;
const char *bool_type_names[]= { "OFF", "ON", NullS }; const char *bool_type_names[]= { "OFF", "ON", NullS };
...@@ -216,7 +216,7 @@ sys_var_long_ptr sys_delayed_insert_timeout("delayed_insert_timeout", ...@@ -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", sys_var_long_ptr sys_delayed_queue_size("delayed_queue_size",
&delayed_queue_size); &delayed_queue_size);
sys_var_event_executor sys_event_executor("event_scheduler", 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", sys_var_long_ptr sys_expire_logs_days("expire_logs_days",
&expire_logs_days); &expire_logs_days);
sys_var_bool_ptr sys_flush("flush", &myisam_flush); sys_var_bool_ptr sys_flush("flush", &myisam_flush);
......
sql/sql_partition.cc
View file @ 56d44ff1
...@@ -116,12 +116,12 @@ uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter); ...@@ -116,12 +116,12 @@ uint32 get_next_partition_id_range(PARTITION_ITERATOR* part_iter);
uint32 get_next_partition_id_list(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, int get_part_iter_for_interval_via_mapping(partition_info *part_info,
bool is_subpart, bool is_subpart,
byte *min_value, byte *max_value, char *min_value, char *max_value,
uint flags, uint flags,
PARTITION_ITERATOR *part_iter); PARTITION_ITERATOR *part_iter);
int get_part_iter_for_interval_via_walking(partition_info *part_info, int get_part_iter_for_interval_via_walking(partition_info *part_info,
bool is_subpart, bool is_subpart,
byte *min_value, byte *max_value, char *min_value, char *max_value,
uint flags, uint flags,
PARTITION_ITERATOR *part_iter); PARTITION_ITERATOR *part_iter);
static void set_up_range_analysis_info(partition_info *part_info); 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, ...@@ -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, int get_part_iter_for_interval_via_mapping(partition_info *part_info,
bool is_subpart, bool is_subpart,
byte *min_value, byte *max_value, char *min_value, char *max_value,
uint flags, uint flags,
PARTITION_ITERATOR *part_iter) PARTITION_ITERATOR *part_iter)
{ {
...@@ -5845,7 +5845,7 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info, ...@@ -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, int get_part_iter_for_interval_via_walking(partition_info *part_info,
bool is_subpart, bool is_subpart,
byte *min_value, byte *max_value, char *min_value, char *max_value,
uint flags, uint flags,
PARTITION_ITERATOR *part_iter) PARTITION_ITERATOR *part_iter)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7