← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

Giant merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
77
77
 
78
78
int
79
79
check_user(THD *thd, enum enum_server_command command,
80
 
           const char *passwd __attribute__((__unused__)),
 
80
           const char *passwd __attribute__((unused)),
81
81
           uint passwd_len, const char *db,
82
82
           bool check_count)
83
83
{
274
274
    thd->main_security_ctx.host_or_ip= thd->main_security_ctx.host;
275
275
    thd->main_security_ctx.ip= 0;
276
276
    /* Reset sin_addr */
277
 
    bzero((char*) &net->vio->remote, sizeof(net->vio->remote));
 
277
    memset((char*) &net->vio->remote, 0, sizeof(net->vio->remote));
278
278
  }
279
279
  vio_keepalive(net->vio, true);
280
280
  
310
310
    /* write server characteristics: up to 16 bytes allowed */
311
311
    end[2]=(char) default_charset_info->number;
312
312
    int2store(end+3, thd->server_status);
313
 
    bzero(end+5, 13);
 
313
    memset(end+5, 0, 13);
314
314
    end+= 18;
315
315
    /* write scramble tail */
316
316
    end= strmake(end, thd->scramble + SCRAMBLE_LENGTH_323,