diff options
| author | unknown <georg@beethoven.local> | 2004-12-15 12:36:01 +0100 |
|---|---|---|
| committer | unknown <georg@beethoven.local> | 2004-12-15 12:36:01 +0100 |
| commit | 33959dc1a4fa638e67bb98892a466692b9ba402e (patch) | |
| tree | b9bdb91060a4d6ab89d3b0a8e3819b508ab7033b /libmysql | |
| parent | 83fce55a3ae79c0033e372cb7ec48a3248307d6e (diff) | |
| download | mariadb-git-33959dc1a4fa638e67bb98892a466692b9ba402e.tar.gz | |
fix for bug #7285: Disable start of embedded server when need to
connect to an external server with mysqld.
libmysql/libmysql.c:
fix for bug #7285: Disable start of embedded server when need to
connect to an external server with libmysqld.
Calling mysql_server_init with a negative value for argc will not
start the embedded server.
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 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 |