diff options
| author | monty@hundin.mysql.fi <> | 2002-08-12 06:49:28 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-12 06:49:28 +0300 |
| commit | 4dfe327a06153de262849d5f75dd9306983d3776 (patch) | |
| tree | 98577473930b06c2b0f734273a5451430bba33e0 | |
| parent | d825808a726960fa4fde7d4569c2d95014ca440f (diff) | |
| download | mariadb-git-4dfe327a06153de262849d5f75dd9306983d3776.tar.gz | |
Fix after merge
| -rw-r--r-- | sql/ha_innobase.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
2 files changed, 1 insertions, 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; } |