diff --git a/sql/ha_federated.h b/sql/ha_federated.h
index 56f5e6de4b7..75f2c227d45 100755
--- a/sql/ha_federated.h
+++ b/sql/ha_federated.h
@@ -72,7 +72,7 @@ private:
       return errorcode otherwise
   */
   uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row);
-  bool ha_federated::create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); 
+  bool create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); 
 
 public:
   ha_federated(TABLE *table): handler(table),
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 84c82035326..8a5933f09a2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5151,8 +5151,8 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
             PROCESSLIST.
             Note that we don't need LOCK_thread_count to modify query_length.
           */
-          if (lex->found_colon &&
-              (thd->query_length= (ulong)(lex->found_colon - thd->query)))
+          if (lex->found_semicolon &&
+              (thd->query_length= (ulong)(lex->found_semicolon - thd->query)))
             thd->query_length--;
           /* Actually execute the query */
 	  mysql_execute_command(thd);