Commit f66967cf authored by serg@serg.mylan's avatar serg@serg.mylan

sql/ha_federated.cc: update to new prototype

sql/item_cmpfunc.cc:     typo fixed
parent 376a4ee0
...@@ -469,6 +469,7 @@ static int check_foreign_data_source(FEDERATED_SHARE *share) ...@@ -469,6 +469,7 @@ static int check_foreign_data_source(FEDERATED_SHARE *share)
*/ */
query.append("SHOW TABLES LIKE '"); query.append("SHOW TABLES LIKE '");
escape_string_for_mysql(&my_charset_bin, (char *)escaped_table_base_name, 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,
share->table_base_name_length); share->table_base_name_length);
query.append(escaped_table_base_name); query.append(escaped_table_base_name);
......
...@@ -1720,7 +1720,7 @@ void Item_func_coalesce::fix_length_and_dec() ...@@ -1720,7 +1720,7 @@ void Item_func_coalesce::fix_length_and_dec()
decimals= 0; decimals= 0;
break; break;
case ROW_RESULT: case ROW_RESULT:
defaullt: default:
DBUG_ASSERT(0); DBUG_ASSERT(0);
} }
} }
......
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