Commit 2033175a authored by unknown's avatar unknown
Browse files

compilation fixes 


sql/ha_federated.h:
  copy-paste fix
sql/sql_parse.cc:
  after-merge fix
parent 475cfa7e

sql/ha_federated.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class ha_federated: public handler 
      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),

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -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);