Commit fe5e1699 authored by unknown's avatar unknown
Browse files

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
parent ecf24c66

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

libmysql/libmysql.c

+2 −1
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), 
    (void) signal(SIGPIPE, SIG_IGN);

#endif

#ifdef EMBEDDED_LIBRARY

    if (argc > -1)

      result= init_embedded_server(argc, argv, groups);

#endif

  }