From 4dfe327a06153de262849d5f75dd9306983d3776 Mon Sep 17 00:00:00 2001
From: "monty@hundin.mysql.fi" <>
Date: Mon, 12 Aug 2002 06:49:28 +0300
Subject: [PATCH] Fix after merge

---
 sql/ha_innobase.cc | 2 +-
 sql/mysqld.cc      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index f9c425d0aac..723100da1c4 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -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);
 }
 }
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 150ad8ea379..b4667db5abe 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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;
   }