← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/client.c

  • Committer: Brian Aker
  • Date: 2008-08-11 01:27:58 UTC
  • Revision ID: brian@tangent.org-20080811012758-sn94s7btsnyeojth
Clean up port startup 

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/client.c
961
961
 
962
962
    if (!drizzle_port)
963
963
    {
964
 
      drizzle_port = MYSQL_PORT;
 
964
      drizzle_port = DRIZZLE_PORT;
965
965
      {
966
966
        struct servent *serv_ptr;
967
967
        char *env;
972
972
          only if they didn't do we check /etc/services (and, failing
973
973
          on that, fall back to the factory default of 4427).
974
974
          either default can be overridden by the environment variable
975
 
          MYSQL_TCP_PORT, which in turn can be overridden with command
 
975
          DRIZZLE_TCP_PORT, which in turn can be overridden with command
976
976
          line options.
977
977
        */
978
978
 
979
 
#if MYSQL_PORT_DEFAULT == 0
 
979
#if DRIZZLE_PORT_DEFAULT == 0
980
980
        if ((serv_ptr = getservbyname("drizzle", "tcp")))
981
981
          drizzle_port = (uint) ntohs((ushort) serv_ptr->s_port);
982
982
#endif