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
cbfe50b0
Commit
cbfe50b0
authored
Dec 02, 2017
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove compiler warnings
parent
a0f2285c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
8 deletions
+9
-8
extra/mariabackup/xtrabackup.cc
extra/mariabackup/xtrabackup.cc
+1
-1
plugin/simple_password_check/simple_password_check.c
plugin/simple_password_check/simple_password_check.c
+4
-1
sql/ha_partition.cc
sql/ha_partition.cc
+0
-2
sql/ha_partition.h
sql/ha_partition.h
+1
-1
storage/mroonga/lib/mrn_context_pool.cpp
storage/mroonga/lib/mrn_context_pool.cpp
+1
-1
strings/json_lib.c
strings/json_lib.c
+2
-2
No files found.
extra/mariabackup/xtrabackup.cc
View file @
cbfe50b0
...
@@ -3022,7 +3022,7 @@ xb_validate_name(
...
@@ -3022,7 +3022,7 @@ xb_validate_name(
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
p
=
strpbrk
(
name
,
"/
\\
~"
);
p
=
strpbrk
(
name
,
"/
\\
~"
);
if
(
p
&&
p
-
name
<
NAME_LEN
)
{
if
(
p
&&
(
uint
)
(
p
-
name
)
<
NAME_LEN
)
{
msg
(
"mariabackup: name `%s` is not valid.
\n
"
,
name
);
msg
(
"mariabackup: name `%s` is not valid.
\n
"
,
name
);
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
...
...
plugin/simple_password_check/simple_password_check.c
View file @
cbfe50b0
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <mysqld_error.h>
#include <mysqld_error.h>
#include <my_attribute.h>
#include <mysql/plugin_password_validation.h>
#include <mysql/plugin_password_validation.h>
#include <ctype.h>
#include <ctype.h>
#include <string.h>
#include <string.h>
...
@@ -50,7 +51,9 @@ static int validate(MYSQL_CONST_LEX_STRING *username,
...
@@ -50,7 +51,9 @@ static int validate(MYSQL_CONST_LEX_STRING *username,
others
<
min_others
;
others
<
min_others
;
}
}
static
void
fix_min_length
(
MYSQL_THD
thd
,
struct
st_mysql_sys_var
*
var
,
static
void
fix_min_length
(
MYSQL_THD
thd
__attribute__
((
unused
)),
struct
st_mysql_sys_var
*
var
__attribute__
((
unused
)),
void
*
var_ptr
,
const
void
*
save
)
void
*
var_ptr
,
const
void
*
save
)
{
{
unsigned
int
new_min_length
;
unsigned
int
new_min_length
;
...
...
sql/ha_partition.cc
View file @
cbfe50b0
...
@@ -223,8 +223,6 @@ static uint alter_table_flags(uint flags __attribute__((unused)))
...
@@ -223,8 +223,6 @@ static uint alter_table_flags(uint flags __attribute__((unused)))
HA_FAST_CHANGE_PARTITION
);
HA_FAST_CHANGE_PARTITION
);
}
}
const
uint32
ha_partition
::
NO_CURRENT_PART_ID
=
NOT_A_PARTITION_ID
;
/*
/*
Constructor method
Constructor method
...
...
sql/ha_partition.h
View file @
cbfe50b0
...
@@ -786,7 +786,7 @@ class ha_partition :public handler
...
@@ -786,7 +786,7 @@ class ha_partition :public handler
Query_cache_block_table
Query_cache_block_table
**
block_table
,
**
block_table
,
handler
*
file
,
uint
*
n
);
handler
*
file
,
uint
*
n
);
static
const
uint
NO_CURRENT_PART_ID
;
static
const
uint
NO_CURRENT_PART_ID
=
NOT_A_PARTITION_ID
;
int
loop_extra
(
enum
ha_extra_function
operation
);
int
loop_extra
(
enum
ha_extra_function
operation
);
int
loop_extra_alter
(
enum
ha_extra_function
operations
);
int
loop_extra_alter
(
enum
ha_extra_function
operations
);
void
late_extra_cache
(
uint
partition_id
);
void
late_extra_cache
(
uint
partition_id
);
...
...
storage/mroonga/lib/mrn_context_pool.cpp
View file @
cbfe50b0
...
@@ -50,7 +50,7 @@ namespace mrn {
...
@@ -50,7 +50,7 @@ namespace mrn {
if
(
pool_
)
{
if
(
pool_
)
{
ctx
=
static_cast
<
grn_ctx
*>
(
pool_
->
data
);
ctx
=
static_cast
<
grn_ctx
*>
(
pool_
->
data
);
list_pop
(
pool_
);
list_pop
(
pool_
);
if
((
now
-
last_pull_time_
)
>=
CLEAR_THREATHOLD_IN_SECONDS
)
{
if
((
uint
)
(
now
-
last_pull_time_
)
>=
CLEAR_THREATHOLD_IN_SECONDS
)
{
clear
();
clear
();
}
}
}
}
...
...
strings/json_lib.c
View file @
cbfe50b0
...
@@ -1386,7 +1386,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
...
@@ -1386,7 +1386,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
if
(
!
json_key_matches
(
je
,
&
key_name
))
if
(
!
json_key_matches
(
je
,
&
key_name
))
continue
;
continue
;
}
}
if
(
cur_step
-
state
->
paths
[
p_c
].
last_step
==
state
->
cur_depth
)
if
(
(
uint
)
(
cur_step
-
state
->
paths
[
p_c
].
last_step
)
==
state
->
cur_depth
)
path_found
=
TRUE
;
path_found
=
TRUE
;
else
else
{
{
...
@@ -1419,7 +1419,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
...
@@ -1419,7 +1419,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state)
cur_step
->
n_item
==
state
->
array_counters
[
state
->
cur_depth
])
cur_step
->
n_item
==
state
->
array_counters
[
state
->
cur_depth
])
{
{
/* Array item matches. */
/* Array item matches. */
if
(
cur_step
-
state
->
paths
[
p_c
].
last_step
==
state
->
cur_depth
)
if
(
(
uint
)
(
cur_step
-
state
->
paths
[
p_c
].
last_step
)
==
state
->
cur_depth
)
path_found
=
TRUE
;
path_found
=
TRUE
;
else
else
{
{
...
...
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