Review fixed

sql/ha_federated.cc:
  Fixed compiler warnings and some indentation problems (still a lot more indentation problems to fix, will come in a later patch)
sql/mysql_priv.h:
  Remove duplicated append_escaped()
sql/sql_analyse.cc:
  Remove duplicated append_escaped()
sql/sql_insert.cc:
  Move extra(HA_EXTRA_IGNORE_DUP_KEY) to a more logical places
  Add missing DBUG_RETURN()

1 files changed, 0 insertions, 37 deletions

diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 3f97cab1511..b6bd49b1553 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -59,8 +59,6 @@ int compare_ulonglong2(void* cmp_arg __attribute__((unused)),
   return compare_ulonglong(s,t);
 }
 
-bool append_escaped(String *to_str, String *from_str);
-bool append_escaped(String *to_str, char *from, uint from_len);
 
 Procedure *
 proc_analyse_init(THD *thd, ORDER *param, select_result *result,
@@ -1087,38 +1085,3 @@ bool append_escaped(String *to_str, String *from_str)
   }
   return 0;
 }
-
-bool append_escaped(String *to_str, char *from, uint from_len)
-{
-  char *end, c;
-
-  if (to_str->realloc(to_str->length() + from_len))
-    return 1;
-
-  end= from + from_len;
-
-  for (; from < end; from++)
-  {
-    c= *from;
-    switch (c) {
-    case '\0':
-      c= '0';
-      break;
-    case '\032':
-      c= 'Z';
-      break;
-    case '\\':
-    case '\'':
-      break;
-    default:
-      goto normal_character;
-    }
-    if (to_str->append('\\'))
-      return 1;
-
-  normal_character:
-    if (to_str->append(c))
-      return 1;
-  }
-  return 0;
-}