1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-12 01:53:02 +03:00

Merge branch '10.0-galera' into 10.1

This commit is contained in:
Sergei Golubchik
2016-11-02 13:44:07 +01:00
162 changed files with 5637 additions and 870 deletions

View File

@ -452,8 +452,9 @@ void read_user_name(char *name)
void read_user_name(char *name)
{
char *str=getenv("USER"); /* ODBC will send user variable */
strmake(name,str ? str : "ODBC", USERNAME_LENGTH);
DWORD len= USERNAME_LENGTH;
if (!GetUserName(name, &len))
strmov(name,"UNKNOWN_USER");
}
#endif