Commit 309e016e authored by Michael Widenius's avatar Michael Widenius

Fixes to get more information about random bind failure in pushbuild for windows hosts.

mysql-test/mysql-test-run.pl:
  Set port-open-timeout to 10 to retry binds
sql/mysqld.cc:
  Write error number for bind failure. (perror can't do that on windows as errno dosn't contain error code)
parent 69027708
...@@ -4913,6 +4913,8 @@ sub mysqld_arguments ($$$) { ...@@ -4913,6 +4913,8 @@ sub mysqld_arguments ($$$) {
} }
mtr_add_arg($args, "%s--disable-sync-frm"); mtr_add_arg($args, "%s--disable-sync-frm");
# Retry bind as this may fail on busy server
mtr_add_arg($args, "%s--port-open-timeout=10");
if (!using_extern() and $mysql_version_id >= 50106 && !$opt_user_args) if (!using_extern() and $mysql_version_id >= 50106 && !$opt_user_args)
{ {
......
...@@ -1842,8 +1842,10 @@ static my_socket activate_tcp_port(uint port) ...@@ -1842,8 +1842,10 @@ static my_socket activate_tcp_port(uint port)
} }
if (ret < 0) if (ret < 0)
{ {
DBUG_PRINT("error",("Got error: %d from bind",socket_errno)); char buff[100];
sql_perror("Can't start server: Bind on TCP/IP port"); sprintf(buff, "Can't start server: Bind on TCP/IP port. Got error: %d",
(int) socket_errno);
sql_perror(buff);
sql_print_error("Do you already have another mysqld server running on " sql_print_error("Do you already have another mysqld server running on "
"port: %u ?", port); "port: %u ?", port);
unireg_abort(1); unireg_abort(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment