Commit da2a8386 authored by Sergei Golubchik's avatar Sergei Golubchik

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

parent 2f07709a
...@@ -1148,6 +1148,7 @@ void mysql_read_default_options(struct st_mysql_options *options, ...@@ -1148,6 +1148,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
break; break;
case OPT_pipe: case OPT_pipe:
options->protocol = MYSQL_PROTOCOL_PIPE; options->protocol = MYSQL_PROTOCOL_PIPE;
break;
case OPT_connect_timeout: case OPT_connect_timeout:
case OPT_timeout: case OPT_timeout:
if (opt_arg) if (opt_arg)
......
...@@ -848,8 +848,9 @@ void Item_func_num1::fix_length_and_dec() ...@@ -848,8 +848,9 @@ void Item_func_num1::fix_length_and_dec()
{ {
DBUG_ENTER("Item_func_num1::fix_length_and_dec"); DBUG_ENTER("Item_func_num1::fix_length_and_dec");
DBUG_PRINT("info", ("name %s", func_name())); 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: case INT_RESULT:
cached_result_type= INT_RESULT;
max_length= args[0]->max_length; max_length= args[0]->max_length;
unsigned_flag= args[0]->unsigned_flag; unsigned_flag= args[0]->unsigned_flag;
break; break;
...@@ -860,8 +861,8 @@ void Item_func_num1::fix_length_and_dec() ...@@ -860,8 +861,8 @@ void Item_func_num1::fix_length_and_dec()
max_length= float_length(decimals); max_length= float_length(decimals);
break; break;
case TIME_RESULT: case TIME_RESULT:
cached_result_type= DECIMAL_RESULT;
case DECIMAL_RESULT: case DECIMAL_RESULT:
cached_result_type= DECIMAL_RESULT;
decimals= args[0]->decimal_scale(); // Do not preserve NOT_FIXED_DEC decimals= args[0]->decimal_scale(); // Do not preserve NOT_FIXED_DEC
max_length= args[0]->max_length; max_length= args[0]->max_length;
break; break;
......
...@@ -9405,8 +9405,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name, ...@@ -9405,8 +9405,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
sizeof(xev->xid)); sizeof(xev->xid));
if (!x || my_hash_insert(&xids, x)) if (!x || my_hash_insert(&xids, x))
goto err2; goto err2;
break;
} }
break;
} }
case BINLOG_CHECKPOINT_EVENT: case BINLOG_CHECKPOINT_EVENT:
if (first_round && do_xa) if (first_round && do_xa)
......
...@@ -2665,6 +2665,7 @@ impossible position"; ...@@ -2665,6 +2665,7 @@ impossible position";
loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK); loop_breaker = (flags & BINLOG_DUMP_NON_BLOCK);
break; break;
} }
/* fall through */
default: default:
errmsg = "could not find next log"; errmsg = "could not find next log";
my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG; my_errno= ER_MASTER_FATAL_ERROR_READING_BINLOG;
......
...@@ -1423,6 +1423,7 @@ bool ha_federated::create_where_from_key(String *to, ...@@ -1423,6 +1423,7 @@ bool ha_federated::create_where_from_key(String *to,
} }
break; break;
} }
/* fall through */
case HA_READ_KEY_OR_NEXT: case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i)); DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
...@@ -1442,6 +1443,7 @@ bool ha_federated::create_where_from_key(String *to, ...@@ -1442,6 +1443,7 @@ bool ha_federated::create_where_from_key(String *to,
goto err; goto err;
break; break;
} }
/* fall through */
case HA_READ_KEY_OR_PREV: case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i)); DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
......
...@@ -1342,6 +1342,7 @@ bool ha_federatedx::create_where_from_key(String *to, ...@@ -1342,6 +1342,7 @@ bool ha_federatedx::create_where_from_key(String *to,
} }
break; break;
} }
/* fall through */
case HA_READ_KEY_OR_NEXT: case HA_READ_KEY_OR_NEXT:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_NEXT %d", i)); DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
...@@ -1361,6 +1362,7 @@ bool ha_federatedx::create_where_from_key(String *to, ...@@ -1361,6 +1362,7 @@ bool ha_federatedx::create_where_from_key(String *to,
goto err; goto err;
break; break;
} }
/* fall through */
case HA_READ_KEY_OR_PREV: case HA_READ_KEY_OR_PREV:
DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_PREV %d", i)); DBUG_PRINT("info", ("federatedx HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
......
...@@ -34,6 +34,7 @@ int heap_extra(register HP_INFO *info, enum ha_extra_function function) ...@@ -34,6 +34,7 @@ int heap_extra(register HP_INFO *info, enum ha_extra_function function)
switch (function) { switch (function) {
case HA_EXTRA_RESET_STATE: case HA_EXTRA_RESET_STATE:
heap_reset(info); heap_reset(info);
/* fall through */
case HA_EXTRA_NO_READCHECK: case HA_EXTRA_NO_READCHECK:
info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */ info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */
break; break;
......
...@@ -1169,6 +1169,7 @@ uint _ma_apply_redo_index(MARIA_HA *info, ...@@ -1169,6 +1169,7 @@ uint _ma_apply_redo_index(MARIA_HA *info,
goto err; goto err;
} }
page_length= page.size; page_length= page.size;
break;
} }
case KEY_OP_NONE: case KEY_OP_NONE:
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment