Commit 4dfe327a authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fix after merge

parent d825808a

sql/ha_innobase.cc

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ innobase_mysql_print_thd( 
	buf[0]='\n';

	buf[1]=0;



 	ut_a(strlen(old_buf) < 400);

 	ut_a(strlen(buf) < 400);

}

}

sql/mysqld.cc

+0 −1
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ void close_server_sock() 
  {

    DBUG_PRINT("info",("calling shutdown on unix socket"));

    VOID(shutdown(unix_sock,2));

    DBUG_PRINT("info",("calling closesocket on unix socket"));

    VOID(unlink(mysql_unix_port));

    unix_sock=INVALID_SOCKET;

  }