Fix after merge

4dfe327a · monty@hundin.mysql.fi · d825808a · 4dfe327a · 4dfe327a
Commit 4dfe327a authored Aug 12, 2002 by monty@hundin.mysql.fi
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/ha_innobase.cc sql/ha_innobase.cc +1 -1

sql/mysqld.cc sql/mysqld.cc +0 -1

No files found.
--- 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);
 }
 }


--- 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;
  }