← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
434
434
 
435
435
    /* fill in user_host value: the format is "%s[%s] @ %s [%s]" */
436
436
    user_host_len= (strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
437
 
                             sctx->priv_user ? sctx->priv_user : "", "[",
438
 
                             sctx->user ? sctx->user : "", "] @ ",
439
 
                             sctx->host ? sctx->host : "", " [",
440
 
                             sctx->ip ? sctx->ip : "", "]", NullS) -
 
437
                             sctx->user, "[", sctx->user, "] @ ",
 
438
                             sctx->ip, " [",
 
439
                             sctx->ip, "]", NullS) -
441
440
                    user_host_buff);
442
441
 
443
442
    current_time= my_time_possible_from_micro(current_utime);
492
491
    return 0;
493
492
  }
494
493
  user_host_len= strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
495
 
                          sctx->priv_user ? sctx->priv_user : "", "[",
496
 
                          sctx->user ? sctx->user : "", "] @ ",
497
 
                          sctx->host ? sctx->host : "", " [",
498
 
                          sctx->ip ? sctx->ip : "", "]", NullS) -
 
494
                          sctx->user, "[",
 
495
                          sctx->user, "] @ ",
 
496
                          sctx->ip, " [",
 
497
                          sctx->ip, "]", NullS) -
499
498
                                                          user_host_buff;
500
499
 
501
500
  current_time= my_time(0);