summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorgeorg@beethoven.site <>2004-12-30 17:17:21 +0100
committergeorg@beethoven.site <>2004-12-30 17:17:21 +0100
commit448d453ac1848019009e824997d7f6d99e083b39 (patch)
treed080aa5ffe7c89cefd85474413dd51f6eb446560 /libmysql
parent551456b30ce34f359ea2d72ca393a4f3c35c940e (diff)
downloadmariadb-git-448d453ac1848019009e824997d7f6d99e083b39.tar.gz
Merge from 4.1: fix for bug #7285 (embedded server)
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c3
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