database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Remove compiler warnings

Browse Source
This commit is contained in:
Monty
2017-12-02 21:50:08 +02:00
parent 52ca07c2a0
commit 60df17e95a
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extra/mariabackup/xtrabackup.cc
View File

@@ -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);
} }

5
plugin/simple_password_check/simple_password_check.c
View File

@@ -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,
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;

2
sql/ha_partition.cc
View File

@@ -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

2
sql/ha_partition.h
View File

@@ -786,7 +786,7 @@ private:
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);

2
storage/mroonga/lib/mrn_context_pool.cpp
View File

@@ -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();
} }
} }

4
strings/json_lib.c
View File

@@ -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)
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
{ {