summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmysql/libmysql.c')
-rw-r--r--libmysql/libmysql.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 10cfb5ec88c..04d2d9d12e4 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -536,7 +536,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)
@@ -1427,7 +1428,7 @@ mysql_init(MYSQL *mysql)
outside program.
*/
-void STDCALL mysql_once_init(void)
+void mysql_once_init(void)
{
if (!mysql_client_init)
{