diff options
| -rw-r--r-- | sql/ha_federated.cc | 1 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index cddd0fd5927..8000aae180d 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -469,6 +469,7 @@ static int check_foreign_data_source(FEDERATED_SHARE *share) */ query.append("SHOW TABLES LIKE '"); escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_base_name, + sizeof(escaped_table_base_name), share->table_base_name, share->table_base_name_length); query.append(escaped_table_base_name); diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index c0cb0704852..9850b01561e 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1720,7 +1720,7 @@ void Item_func_coalesce::fix_length_and_dec() decimals= 0; break; case ROW_RESULT: - defaullt: + default: DBUG_ASSERT(0); } } |