summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeorg@beethoven.local <>2004-12-18 15:00:50 +0100
committergeorg@beethoven.local <>2004-12-18 15:00:50 +0100
commitae3028e5a3c936aace30ae34b5efafc647c56ffe (patch)
tree74ad72d8038987f9e042c44fd6a8e1957ab5f4bc
parent35942c09de6c6a4f18658624f50adabc5295e1a7 (diff)
parent8482a2fc50d4dd0282a3a5bf9f805c796ffdf14b (diff)
downloadmariadb-git-ae3028e5a3c936aace30ae34b5efafc647c56ffe.tar.gz
Merge
-rw-r--r--libmysql/libmysql.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index a71e99a5642..b180e86392d 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