← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/drizzle.cc

  • Committer: devananda
  • Date: 2009-06-30 14:27:54 UTC
  • mfrom: (1030.2.4 trunk)
  • mto: (1093.1.7 captain)
  • mto: This revision was merged to the branch mainline in revision 1095.
  • Revision ID: devananda.vdv@gmail.com-20090630142754-vm9w374yxkf1pikc
merge from lp

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/drizzle.cc
44
44
 
45
45
 
46
46
#define CONNECT_TIMEOUT 0
 
47
#define PROTOCOL_VERSION 10
 
48
 
47
49
 
48
50
static bool drizzle_client_init= false;
49
51
unsigned int drizzle_server_last_errno;
88
90
 
89
91
    if (!drizzleclient_get_default_port())
90
92
    {
91
 
      drizzleclient_set_default_port(DRIZZLE_PORT);
 
93
      drizzleclient_set_default_port(DRIZZLE_TCP_PORT);
92
94
      {
93
95
        struct servent *serv_ptr;
94
96
        char *env;
103
105
          line options.
104
106
        */
105
107
 
106
 
#if DRIZZLE_PORT_DEFAULT == 0
 
108
#if DRIZZLE_TCP_PORT_DEFAULT == 0
107
109
        if ((serv_ptr = getservbyname("drizzle", "tcp")))
108
110
          drizzleclient_set_default_port((uint32_t) ntohs((uint16_t) serv_ptr->s_port));
109
111
#endif