From f66967cf1b05f43ef492a9791f16e303d49b0906 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 17 Mar 2005 16:58:23 +0100
Subject: [PATCH] sql/ha_federated.cc:     update to new prototype
 sql/item_cmpfunc.cc:     typo fixed

---
 sql/ha_federated.cc | 1 +
 sql/item_cmpfunc.cc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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