diff options
| author | unknown <joerg@debian.(none)> | 2007-04-23 18:12:23 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-04-23 18:12:23 +0200 |
| commit | e7bb912835c43d3ea39f7a2c1aa72958e080a8fe (patch) | |
| tree | af1464b1877197bf9f48e4661adb938b3ed5004e /dbug | |
| parent | c68b2960ada18f133f3776ff1c4cb9f666928130 (diff) | |
| parent | e67c28ca493df1b75bcf06a6bc3a3666277c9f6a (diff) | |
| download | mariadb-git-e7bb912835c43d3ea39f7a2c1aa72958e080a8fe.tar.gz | |
Merge debian.(none):/M50/bug14685-5.0
into debian.(none):/M51/bug14685-5.1
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]); |