mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Introduce a workaround for Solaris' inability to deal with dtrace in static libraries.
Rerun dtrace -G on all objects that can contan dtrace probes (also objects that are part of static libs) before linking mysqld to produce dtrace_probes_all.o and link dtrace_probes_all.o with mysqld This ugly workaround was inspired by handling dtrace using autotools.
This commit is contained in:
@@ -4309,7 +4309,7 @@ static void test_lc_time_sz()
|
||||
#ifdef __WIN__
|
||||
int win_main(int argc, char **argv)
|
||||
#else
|
||||
int main(int argc, char **argv)
|
||||
int mysqld_main(int argc, char **argv)
|
||||
#endif
|
||||
{
|
||||
MY_INIT(argv[0]); // init my_sys library & pthreads
|
||||
@@ -4699,7 +4699,7 @@ default_service_handling(char **argv,
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int mysqld_main(int argc, char **argv)
|
||||
{
|
||||
/*
|
||||
When several instances are running on the same machine, we
|
||||
|
Reference in New Issue
Block a user