← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Brian Aker
  • Date: 2008-12-09 17:33:02 UTC
  • mfrom: (656.1.54 devel)
  • Revision ID: brian@tangent.org-20081209173302-aptngvc7efxnatnt
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
55
55
    return NULL;
56
56
  }
57
57
 
58
 
  if (!(name= my_strdup(hostname_buff, MYF(0))))
 
58
  if (!(name= strdup(hostname_buff)))
59
59
  {
60
60
    return NULL;
61
61
  }
245
245
      my_error(ER_BAD_HOST_ERROR, MYF(0), session->main_security_ctx.ip);
246
246
      return 1;
247
247
    }
248
 
    if (!(session->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME))))
249
 
      return 1; /* The error is set by my_strdup(). */
 
248
    if (!(session->main_security_ctx.ip= strdup(ip)))
 
249
      return 1; /* The error is set by strdup(). */
250
250
  }
251
251
  net_keepalive(net, true);
252
252
 
389
389
  if (session->main_security_ctx.user)
390
390
    if (session->main_security_ctx.user)
391
391
      free(session->main_security_ctx.user);
392
 
  if (!(session->main_security_ctx.user= my_strdup(user, MYF(MY_WME))))
393
 
    return 1; /* The error is set by my_strdup(). */
 
392
  if (!(session->main_security_ctx.user= strdup(user)))
 
393
    return 1; /* The error is set by strdup(). */
394
394
  return check_user(session, passwd, passwd_len, db, true);
395
395
}
396
396