mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
commit
0c0d8cfd96
2 changed files with 3 additions and 1 deletions
|
@ -43,6 +43,7 @@ dlenev@jabberwock.localdomain
|
||||||
dlenev@mysql.com
|
dlenev@mysql.com
|
||||||
ejonore@mc03.ndb.mysql.com
|
ejonore@mc03.ndb.mysql.com
|
||||||
georg@beethoven.local
|
georg@beethoven.local
|
||||||
|
georg@beethoven.site
|
||||||
gerberb@ou800.zenez.com
|
gerberb@ou800.zenez.com
|
||||||
gluh@gluh.(none)
|
gluh@gluh.(none)
|
||||||
gluh@gluh.mysql.r18.ru
|
gluh@gluh.mysql.r18.ru
|
||||||
|
|
|
@ -158,7 +158,8 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
|
||||||
(void) signal(SIGPIPE, SIG_IGN);
|
(void) signal(SIGPIPE, SIG_IGN);
|
||||||
#endif
|
#endif
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
result= init_embedded_server(argc, argv, groups);
|
if (argc > -1)
|
||||||
|
result= init_embedded_server(argc, argv, groups);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#ifdef THREAD
|
#ifdef THREAD
|
||||||
|
|
Loading…
Add table
Reference in a new issue