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
This commit is contained in:
unknown 2004-12-30 17:17:21 +01:00
parent ecf24c66cf
commit fe5e169980
2 changed files with 3 additions and 1 deletions

View file

@ -43,6 +43,7 @@ dlenev@jabberwock.localdomain
dlenev@mysql.com
ejonore@mc03.ndb.mysql.com
georg@beethoven.local
georg@beethoven.site
gerberb@ou800.zenez.com
gluh@gluh.(none)
gluh@gluh.mysql.r18.ru

View file

@ -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