Merge debian.(none):/M50/bug14685-5.0

into  debian.(none):/M51/bug14685-5.1
This commit is contained in:
unknown 2007-04-23 18:12:23 +02:00
commit e7bb912835

View file

@ -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]);