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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fa51a223
Commit
fa51a223
authored
Sep 12, 2014
by
Michael Widenius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler warnings
parent
e36d6f03
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
sql/log_event.cc
sql/log_event.cc
+3
-2
storage/connect/array.cpp
storage/connect/array.cpp
+1
-2
storage/connect/tabmysql.cpp
storage/connect/tabmysql.cpp
+1
-1
storage/connect/xindex.cpp
storage/connect/xindex.cpp
+1
-1
No files found.
sql/log_event.cc
View file @
fa51a223
...
@@ -1020,8 +1020,9 @@ Log_event::do_shall_skip(rpl_group_info *rgi)
...
@@ -1020,8 +1020,9 @@ Log_event::do_shall_skip(rpl_group_info *rgi)
Relay_log_info
*
rli
=
rgi
->
rli
;
Relay_log_info
*
rli
=
rgi
->
rli
;
DBUG_PRINT
(
"info"
,
(
"ev->server_id: %lu, ::server_id: %lu,"
DBUG_PRINT
(
"info"
,
(
"ev->server_id: %lu, ::server_id: %lu,"
" rli->replicate_same_server_id: %d,"
" rli->replicate_same_server_id: %d,"
" rli->slave_skip_counter: %lu"
,
" rli->slave_skip_counter: %llu"
,
(
ulong
)
server_id
,
(
ulong
)
global_system_variables
.
server_id
,
(
ulong
)
server_id
,
(
ulong
)
global_system_variables
.
server_id
,
rli
->
replicate_same_server_id
,
rli
->
replicate_same_server_id
,
rli
->
slave_skip_counter
));
rli
->
slave_skip_counter
));
if
((
server_id
==
global_system_variables
.
server_id
&&
if
((
server_id
==
global_system_variables
.
server_id
&&
...
...
storage/connect/array.cpp
View file @
fa51a223
...
@@ -578,7 +578,7 @@ bool ARRAY::CanBeShort(void)
...
@@ -578,7 +578,7 @@ bool ARRAY::CanBeShort(void)
/***********************************************************************/
/***********************************************************************/
int
ARRAY
::
Convert
(
PGLOBAL
g
,
int
k
,
PVAL
vp
)
int
ARRAY
::
Convert
(
PGLOBAL
g
,
int
k
,
PVAL
vp
)
{
{
int
i
,
prec
=
0
;
int
i
;
bool
b
=
FALSE
;
bool
b
=
FALSE
;
PMBV
ovblk
=
Valblk
;
PMBV
ovblk
=
Valblk
;
PVBLK
ovblp
=
Vblp
;
PVBLK
ovblp
=
Vblp
;
...
@@ -588,7 +588,6 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
...
@@ -588,7 +588,6 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
switch
(
Type
)
{
switch
(
Type
)
{
case
TYPE_DOUBLE
:
case
TYPE_DOUBLE
:
prec
=
2
;
case
TYPE_SHORT
:
case
TYPE_SHORT
:
case
TYPE_INT
:
case
TYPE_INT
:
case
TYPE_DATE
:
case
TYPE_DATE
:
...
...
storage/connect/tabmysql.cpp
View file @
fa51a223
...
@@ -905,7 +905,7 @@ bool TDBMYSQL::OpenDB(PGLOBAL g)
...
@@ -905,7 +905,7 @@ bool TDBMYSQL::OpenDB(PGLOBAL g)
}
// endif MakeInsert
}
// endif MakeInsert
if
(
m_Rc
!=
RC_FX
)
{
if
(
m_Rc
!=
RC_FX
)
{
int
rc
;
int
rc
__attribute__
((
unused
))
;
char
cmd
[
64
];
char
cmd
[
64
];
int
w
;
int
w
;
...
...
storage/connect/xindex.cpp
View file @
fa51a223
...
@@ -411,7 +411,7 @@ bool XINDEX::Make(PGLOBAL g, PIXDEF sxp)
...
@@ -411,7 +411,7 @@ bool XINDEX::Make(PGLOBAL g, PIXDEF sxp)
kcp
=
new
(
g
)
KXYCOL
(
this
);
kcp
=
new
(
g
)
KXYCOL
(
this
);
if
(
kcp
->
Init
(
g
,
colp
,
n
,
true
,
NULL
))
if
(
kcp
->
Init
(
g
,
colp
,
n
,
true
,
0
))
return
true
;
return
true
;
if
(
trace
)
if
(
trace
)
...
...
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