MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:April 23 2007 11:36am
Subject:bk commit into 5.0 tree (joerg:1.2460) BUG#14685
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-23 13:36:18+02:00, joerg@debian.(none) +1 -0
  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@stripped, 2007-04-23 13:36:12+02:00, joerg@debian.(none) +3 -1
    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

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	debian.(none)
# Root:	/M50/bug14685-5.0

--- 1.7/dbug/dbug_analyze.c	2006-12-14 23:51:28 +01:00
+++ 1.8/dbug/dbug_analyze.c	2007-04-23 13:36:12 +02:00
@@ -574,10 +574,12 @@
     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]);
Thread
bk commit into 5.0 tree (joerg:1.2460) BUG#14685Joerg Bruehe23 Apr