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
4561014a
Commit
4561014a
authored
Oct 14, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile errors on windows
parent
ea26f5e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
VC++Files/test1/mysql_thr.c
VC++Files/test1/mysql_thr.c
+1
-1
VC++Files/thr_test/thr_test.c
VC++Files/thr_test/thr_test.c
+1
-1
sql/log_event.cc
sql/log_event.cc
+3
-4
No files found.
VC++Files/test1/mysql_thr.c
View file @
4561014a
...
...
@@ -33,7 +33,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
#define pthread_handler_t unsigned __cdecl
*
#define pthread_handler_t unsigned __cdecl
typedef
unsigned
(
__cdecl
*
pthread_handler
)(
void
*
);
#define pthread_self() GetCurrentThread()
...
...
VC++Files/thr_test/thr_test.c
View file @
4561014a
...
...
@@ -44,7 +44,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
#define pthread_handler_t unsigned __cdecl
*
#define pthread_handler_t unsigned __cdecl
typedef
unsigned
(
__cdecl
*
pthread_handler
)(
void
*
);
#define pthread_self() GetCurrentThread()
...
...
sql/log_event.cc
View file @
4561014a
...
...
@@ -1160,7 +1160,7 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg,
But it's likely that we don't want to use 32 bits for 3 bits; in the future
we will probably want to reclaim the 29 bits. So we need the &.
*/
flags2
=
thd_arg
->
options
&
OPTIONS_WRITTEN_TO_BIN_LOG
;
flags2
=
(
uint32
)
(
thd_arg
->
options
&
OPTIONS_WRITTEN_TO_BIN_LOG
)
;
DBUG_ASSERT
(
thd
->
variables
.
character_set_client
->
number
<
256
*
256
);
DBUG_ASSERT
(
thd
->
variables
.
collation_connection
->
number
<
256
*
256
);
DBUG_ASSERT
(
thd
->
variables
.
collation_server
->
number
<
256
*
256
);
...
...
@@ -2984,9 +2984,8 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg,
llstr
(
pos_arg
,
buff
),
flags
));
#endif
if
(
flags
&
DUP_NAME
)
new_log_ident
=
my_strdup_with_length
(
new_log_ident_arg
,
ident_len
,
MYF
(
MY_WME
));
new_log_ident
=
my_strdup_with_length
((
const
byte
*
)
new_log_ident_arg
,
ident_len
,
MYF
(
MY_WME
));
DBUG_VOID_RETURN
;
}
#endif
...
...
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