summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
diff options
context:
space:
mode:
authorgeorg@beethoven.local <>2004-12-15 12:36:01 +0100
committergeorg@beethoven.local <>2004-12-15 12:36:01 +0100
commit8482a2fc50d4dd0282a3a5bf9f805c796ffdf14b (patch)
treeb9bdb91060a4d6ab89d3b0a8e3819b508ab7033b /libmysql/libmysql.c
parent91457448c29e4d6a23583fb8fd35ad763b2d93da (diff)
downloadmariadb-git-8482a2fc50d4dd0282a3a5bf9f805c796ffdf14b.tar.gz
fix for bug #7285: Disable start of embedded server when need to
connect to an external server with mysqld.
Diffstat (limited to 'libmysql/libmysql.c')
-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