diff options
| author | unknown <joerg@debian.(none)> | 2007-04-23 13:36:18 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-04-23 13:36:18 +0200 |
| commit | e67c28ca493df1b75bcf06a6bc3a3666277c9f6a (patch) | |
| tree | 65fd9f22a1f971cb77b79ce2a683678759c3bd45 /dbug | |
| parent | 26aba3fb2c2924f530d258593abecda5d3a90a22 (diff) | |
| download | mariadb-git-e67c28ca493df1b75bcf06a6bc3a3666277c9f6a.tar.gz | |
dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()"
in a build "--without-server".
Fix for bug#14685
dbug/dbug_analyze.c:
In a build "--without-server", the libraries will be built without threading.
In this case, "my_thread_global_init()" is missing in the libraries, and the
linker will report an unresolved symbol.
Avoid this error by making the call to "my_thread_global_init()" depend on
"#ifdef THREAD".
Fix for bug#14685
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug_analyze.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dbug/dbug_analyze.c b/dbug/dbug_analyze.c index 8cd0af4f7e0..3263b2ccc59 100644 --- a/dbug/dbug_analyze.c +++ b/dbug/dbug_analyze.c @@ -574,10 +574,12 @@ int main (int argc, char **argv) FILE *infile; FILE *outfile = {stdout}; -#if defined(HAVE_PTHREAD_INIT) && defined(THREAD) +#ifdef THREAD +#if defined(HAVE_PTHREAD_INIT) pthread_init(); /* Must be called before DBUG_ENTER */ #endif my_thread_global_init(); +#endif /* THREAD */ { DBUG_ENTER ("main"); DBUG_PROCESS (argv[0]); |