diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-17 05:43:37 +0200 |
| commit | e793dfe95e70c60af4a517ba7a5255ad15d48d95 (patch) | |
| tree | a3fbfddbae0d5a6e600e68942bb243fadb5269aa /libmysql | |
| parent | 77f5c5a7cf4e99fa3d760f1541bafec3b182def3 (diff) | |
| parent | 300b3fb64280ae3d982745b683029a2722b3daef (diff) | |
| download | mariadb-git-e793dfe95e70c60af4a517ba7a5255ad15d48d95.tar.gz | |
Merge with 4.0.11 tree to get latest bug fixes
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index be51b530677..fee2895253e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -774,7 +774,8 @@ char* getlogin(void); /* default to "root" on NetWare */ static void read_user_name(char *name) { - (void)strmake(name,"root", USERNAME_LENGTH); + char *str=getenv("USER"); + strmake(name, str ? str : "UNKNOWN_USER", USERNAME_LENGTH); } #elif !defined(MSDOS) && ! defined(VMS) && !defined(__WIN__) && !defined(OS2) @@ -1773,7 +1774,7 @@ mysql_init(MYSQL *mysql) outside program. */ -void STDCALL mysql_once_init(void) +void mysql_once_init(void) { if (!mysql_client_init) { |