← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_unix_socket_protocol/protocol.cc

  • Committer: Joseph Daly
  • Date: 2010-10-31 20:44:18 UTC
  • mfrom: (1894 build)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: skinny.moey@gmail.com-20101031204418-dq03jokakmudu3iu
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_unix_socket_protocol/protocol.cc
99
99
  (void) setsockopt(unix_sock, SOL_SOCKET, SO_REUSEADDR, (char*)&arg, sizeof(arg));
100
100
 
101
101
  addrlen= sizeof(servAddr);
102
 
  if (bind(unix_sock, reinterpret_cast<struct sockaddr *>(&servAddr), addrlen) < 0)
 
102
  if (::bind(unix_sock, reinterpret_cast<sockaddr *>(&servAddr), addrlen) < 0)
103
103
  { 
104
104
    std::cerr << "Can't start server : Bind on unix socket\n";
105
 
    std::cerr << "Do you already have another of drizzled or mysqld running on socket: " << "/tmp/mysql.socket" << "?\n";
 
105
    std::cerr << "Do you already have another of drizzled or mysqld running on socket: " << unix_socket_path << "?\n";
106
106
    std::cerr << "Can't start server : UNIX Socket";
107
107
 
108
108
    return false;