diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-12-18 16:44:24 -0200 |
| commit | 61ae92889808c3c38c5e449e36fc30f89e8e3f23 (patch) | |
| tree | 8cb3e4210dd5da0c3cec217f0e5008ee9104715b /server-tools | |
| parent | f815246486444ca2dc5d408099439e1d973d3a7b (diff) | |
| parent | 06a1df91813ea2c39f7312bcf8af972c7e8a926f (diff) | |
| download | mariadb-git-61ae92889808c3c38c5e449e36fc30f89e8e3f23.tar.gz | |
Manual merge.
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/listener.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index 4d8a33e7db1..3374776b2a0 100644 --- a/server-tools/instance-manager/listener.cc +++ b/server-tools/instance-manager/listener.cc @@ -272,7 +272,7 @@ create_unix_socket(struct sockaddr_un &unix_socket_address) unix_socket_address.sun_family= AF_UNIX; strmake(unix_socket_address.sun_path, Options::Main::socket_file_name, - sizeof(unix_socket_address.sun_path)); + sizeof(unix_socket_address.sun_path) - 1); unlink(unix_socket_address.sun_path); // in case we have stale socket file /* |