diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-22 11:01:28 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-22 11:01:28 +0200 |
| commit | 07b40e621e5ff2a285b673b6b7bab345c7c361cf (patch) | |
| tree | 5cbf5acd9871f4013aae8ed412d72912dbc4706f /libmysql/libmysql.c | |
| parent | 4e17890f6afaddfa8bcdb483a60505b7aee1f652 (diff) | |
| parent | a594279dc99b0397476fbc4b2179657cd1a3e9e7 (diff) | |
| download | mariadb-git-07b40e621e5ff2a285b673b6b7bab345c7c361cf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
innobase/rem/rem0cmp.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql-common/client.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -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 d9b01caf0ea..e88e34f8925 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -259,7 +259,8 @@ mysql_debug(const char *debug __attribute__((unused))) #else { char buff[80]; - strmov(strmov(buff,"libmysql: "),env); + buff[sizeof(buff)-1]= 0; + strxnmov(buff,sizeof(buff)-1,"libmysql: ", env, NullS); MessageBox((HWND) 0,"Debugging variable MYSQL_DEBUG used",buff,MB_OK); } #endif @@ -695,7 +696,7 @@ char* getlogin(void); #endif #if defined(__NETWARE__) -/* default to "root" on NetWare */ +/* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */ void read_user_name(char *name) { char *str=getenv("USER"); |