Merge work:/my/mysql-4.0/ into tik.mysql.fi:/home/my/mysql-4.0

sql/mysqld.cc: Auto merged

Merge work:/my/mysql-4.0/ into tik.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc: Auto merged
84888547 · unknown · 594ba4a2 · 2240cd2f · 84888547
Commit 84888547 authored Mar 10, 2002 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -970,8 +970,11 @@ static void server_init(void)
      unireg_abort(1);
    }
    if (listen(ip_sock,(int) back_log) < 0)
-      sql_print_error("Warning:  listen() on TCP/IP failed with error %d",
+    {
+      sql_print_error("Error:  listen() on TCP/IP failed with error %d",
 		      socket_errno);
+      unireg_abort(1);
+    }
  }

  if (mysqld_chroot)