← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libmysql/libmysql.c

Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/libmysql.c
478
478
char* getlogin(void);
479
479
#endif
480
480
 
481
 
#if defined(__NETWARE__)
482
 
/* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */
483
 
void read_user_name(char *name)
484
 
{
485
 
  char *str=getenv("USER");
486
 
  strmake(name, str ? str : "UNKNOWN_USER", USERNAME_LENGTH);
487
 
}
488
 
 
489
 
#elif !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__)
490
 
 
491
481
void read_user_name(char *name)
492
482
{
493
483
  DBUG_ENTER("read_user_name");
516
506
  DBUG_VOID_RETURN;
517
507
}
518
508
 
519
 
#else /* If MSDOS || VMS */
520
 
 
521
 
void read_user_name(char *name)
522
 
{
523
 
  char *str=getenv("USER");             /* ODBC will send user variable */
524
 
  strmake(name,str ? str : "ODBC", USERNAME_LENGTH);
525
 
}
526
 
 
527
 
#endif
528
 
 
529
509
my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
530
510
{
531
511
  my_bool result= 1;