diff options
author | unknown <georg@beethoven.site> | 2004-12-30 17:17:21 +0100 |
---|---|---|
committer | unknown <georg@beethoven.site> | 2004-12-30 17:17:21 +0100 |
commit | fe5e169980018bc78b956bb0e86a25b10b783eef (patch) | |
tree | d080aa5ffe7c89cefd85474413dd51f6eb446560 /libmysql | |
parent | ecf24c66cf316baaf632fc998fbccfc305b68931 (diff) | |
download | mariadb-git-fe5e169980018bc78b956bb0e86a25b10b783eef.tar.gz |
Merge from 4.1: fix for bug #7285 (embedded server)
libmysql/libmysql.c:
Merge from 4.1: fix for bug #7285
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 8c20b566957..5ddc3402c88 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -158,7 +158,8 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), (void) signal(SIGPIPE, SIG_IGN); #endif #ifdef EMBEDDED_LIBRARY - result= init_embedded_server(argc, argv, groups); + if (argc > -1) + result= init_embedded_server(argc, argv, groups); #endif } #ifdef THREAD |