summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-02-17 02:14:37 +0200
committermonty@mashka.mysql.fi <>2003-02-17 02:14:37 +0200
commit6051b2f9988f1e317be41e49c64718cc610c1260 (patch)
tree49ba5df63376ec1ba88e54e1446b29a777bba1a9 /libmysql
parent153cefc61b15e182157ab7da9a14ab014c4f95de (diff)
downloadmariadb-git-6051b2f9988f1e317be41e49c64718cc610c1260.tar.gz
Fixed multi-table-delete for InnoDB tables
Novell patches
Diffstat (limited to 'libmysql')
-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)
{