mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge with 4.0.11 tree to get latest bug fixes
This commit is contained in:
@ -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)
|
||||
{
|
||||
|
Reference in New Issue
Block a user