database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthrough=]

Browse Source
This commit is contained in:
Sergei Golubchik
2017-07-19 19:46:07 +02:00
parent 2f07709aed
commit da2a838628
8 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql-common/client.c
View File

@ -1148,6 +1148,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
break;
case OPT_pipe:
options->protocol = MYSQL_PROTOCOL_PIPE;
break;
case OPT_connect_timeout:
case OPT_timeout:
if (opt_arg)

5
sql/item_func.cc
View File

@ -848,8 +848,9 @@ void Item_func_num1::fix_length_and_dec()
{
DBUG_ENTER("Item_func_num1::fix_length_and_dec");
DBUG_PRINT("info", ("name %s", func_name()));
switch (cached_result_type= args[0]->cast_to_int_type()) {
switch (args[0]->cast_to_int_type()) {
case INT_RESULT:
cached_result_type= INT_RESULT;
max_length= args[0]->max_length;
unsigned_flag= args[0]->unsigned_flag;
break;
@ -860,8 +861,8 @@ void Item_func_num1::fix_length_and_dec()
max_length= float_length(decimals);
break;
case TIME_RESULT:
cached_result_type= DECIMAL_RESULT;
case DECIMAL_RESULT:
cached_result_type= DECIMAL_RESULT;
decimals= args[0]->decimal_scale(); // Do not preserve NOT_FIXED_DEC
max_length= args[0]->max_length;
break;

2
sql/log.cc
View File

@ -9405,8 +9405,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
sizeof(xev->xid));
if (!x || my_hash_insert(&xids, x))
goto err2;
break;
}
break;
}
case BINLOG_CHECKPOINT_EVENT:
if (first_round && do_xa)

1
sql/sql_repl.cc
View File

@ -2665,6 +2665,7 @@ impossible position";
loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK);
break;
}
/* fall through */
default:
errmsg = "could not find next log";
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;

2
storage/federated/ha_federated.cc
View File

@ -1423,6 +1423,7 @@ bool ha_federated::create_where_from_key(String *to,
}
break;
}
/* fall through */
case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) ||
@ -1442,6 +1443,7 @@ bool ha_federated::create_where_from_key(String *to,
goto err;
break;
}
/* fall through */
case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) ||

2
storage/federatedx/ha_federatedx.cc
View File

@ -1342,6 +1342,7 @@ bool ha_federatedx::create_where_from_key(String *to,
}
break;
}
/* fall through */
case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) ||
@ -1361,6 +1362,7 @@ bool ha_federatedx::create_where_from_key(String *to,
goto err;
break;
}
/* fall through */
case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) ||

1
storage/heap/hp_extra.c
View File

@ -34,6 +34,7 @@ int heap_extra(register HP_INFO *info, enum ha_extra_function function)
switch (function) {
case HA_EXTRA_RESET_STATE:
heap_reset(info);
/* fall through */
case HA_EXTRA_NO_READCHECK:
info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */
break;

1
storage/maria/ma_key_recover.c
View File

@ -1169,6 +1169,7 @@ uint _ma_apply_redo_index(MARIA_HA *info,
goto err;
}
page_length= page.size;
break;
}
case KEY_OP_NONE:
default: