mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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
This commit is contained in:
@ -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");
|
||||
|
Reference in New Issue
Block a user