Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
899fc265
Commit
899fc265
authored
Jan 30, 2006
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows compile fixes in preparation for 5.1.6 beta.
parent
43e6c85b
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
517 additions
and
34 deletions
+517
-34
VC++Files/client/mysqldump.vcproj
VC++Files/client/mysqldump.vcproj
+27
-0
VC++Files/mysql.sln
VC++Files/mysql.sln
+14
-14
VC++Files/sql/mysqld.vcproj
VC++Files/sql/mysqld.vcproj
+462
-6
scripts/make_win_src_distribution.sh
scripts/make_win_src_distribution.sh
+1
-1
sql/event.h
sql/event.h
+1
-1
sql/event_executor.cc
sql/event_executor.cc
+1
-1
sql/event_timed.cc
sql/event_timed.cc
+1
-1
sql/ha_archive.cc
sql/ha_archive.cc
+1
-1
sql/handler.h
sql/handler.h
+1
-1
sql/opt_range.cc
sql/opt_range.cc
+2
-2
sql/set_var.cc
sql/set_var.cc
+2
-2
sql/sql_partition.cc
sql/sql_partition.cc
+4
-4
No files found.
VC++Files/client/mysqldump.vcproj
View file @
899fc265
...
...
@@ -226,6 +226,33 @@
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
<File
RelativePath=
"..\sql-common\my_user.c"
>
<FileConfiguration
Name=
"Debug|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"Release|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
<FileConfiguration
Name=
"classic|Win32"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
AdditionalIncludeDirectories=
""
PreprocessorDefinitions=
""
/>
</FileConfiguration>
</File>
</Files>
<Globals>
</Globals>
...
...
VC++Files/mysql.sln
View file @
899fc265
...
...
@@ -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
...
...
VC++Files/sql/mysqld.vcproj
View file @
899fc265
This diff is collapsed.
Click to expand it.
scripts/make_win_src_distribution.sh
View file @
899fc265
...
...
@@ -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
...
...
sql/event.h
View file @
899fc265
...
...
@@ -157,7 +157,7 @@ public:
update_fields
(
THD
*
thd
);
char
*
get_show_create_event
(
THD
*
thd
,
uint
*
length
);
get_show_create_event
(
THD
*
thd
,
uint
32
*
length
);
int
execute
(
THD
*
thd
,
MEM_ROOT
*
mem_root
=
NULL
);
...
...
sql/event_executor.cc
View file @
899fc265
...
...
@@ -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
;
...
...
sql/event_timed.cc
View file @
899fc265
...
...
@@ -934,7 +934,7 @@ done:
char
*
event_timed
::
get_show_create_event
(
THD
*
thd
,
uint
*
length
)
event_timed
::
get_show_create_event
(
THD
*
thd
,
uint
32
*
length
)
{
char
*
dst
,
*
ret
;
uint
len
,
tmp_len
;
...
...
sql/ha_archive.cc
View file @
899fc265
...
...
@@ -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
);
}
...
...
sql/handler.h
View file @
899fc265
...
...
@@ -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
);
...
...
sql/opt_range.cc
View file @
899fc265
...
...
@@ -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
)
{
...
...
sql/set_var.cc
View file @
899fc265
...
...
@@ -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
);
...
...
sql/sql_partition.cc
View file @
899fc265
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment