Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  chilla.local:/home/mydev/mysql-5.0-axmrg

BUILD/SETUP.sh.rej

+***************
+*** 39,46 ****
+  c_warnings="$global_warnings -Wunused"
+  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+  
+! alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
+! pentium_cflags="-mcpu=pentiumpro"
+  sparc_cflags=""
+  
+  # be as fast as we can be without losing our ability to backtrace
+--- 39,46 ----
+  c_warnings="$global_warnings -Wunused"
+  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+  
+! #alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet
+! #pentium_cflags="-mcpu=pentiumpro"
+  sparc_cflags=""
+  
+  # be as fast as we can be without losing our ability to backtrace

Makefile.am

@@ -123,6 +123,7 @@ tags:
 # making sure each user use different ports.
 
 test-ps:
+	cd mysql-test ; \
 	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol
 
 test-ns:

include/my_global.h.rej

+***************
+*** 97,103 ****
+  
+  
+  /* Fix problem with S_ISLNK() on Linux */
+! #if defined(HAVE_LINUXTHREADS)
+  #undef  _GNU_SOURCE
+  #define _GNU_SOURCE 1
+  #endif
+--- 97,103 ----
+  
+  
+  /* Fix problem with S_ISLNK() on Linux */
+! #if defined(TARGET_OS_LINUX) || defined(__GLIBC__)
+  #undef  _GNU_SOURCE
+  #define _GNU_SOURCE 1
+  #endif

include/my_pthread.h

@@ -49,7 +49,6 @@ extern "C" {
 #define NPTL_PTHREAD_EXIT_BUG	1
 #endif 
 
-
 #if defined(__WIN__) || defined(OS2)
 
 #ifdef OS2
@@ -764,6 +763,15 @@ extern uint my_thread_end_wait_time;
   Keep track of shutdown,signal, and main threads so that my_end() will not
   report errors with them
 */
+
+/* Which kind of thread library is in use */
+
+#define THD_LIB_OTHER 1
+#define THD_LIB_NPTL  2
+#define THD_LIB_LT    4
+
+extern uint thd_lib_detected;
+
 	/* statistics_xxx functions are for not essential statistic */
 
 #ifndef thread_safe_increment

include/my_pthread.h.rej

+***************
+*** 286,293 ****
+  #undef HAVE_PTHREAD_RWLOCK_RDLOCK
+  #undef HAVE_SNPRINTF
+  
+! #define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
+! #define signal(A,B) pthread_signal((A),(void (*)(int)) (B))
+  #define my_pthread_attr_setprio(A,B)
+  #endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
+  
+--- 294,301 ----
+  #undef HAVE_PTHREAD_RWLOCK_RDLOCK
+  #undef HAVE_SNPRINTF
+  
+! #define my_sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
+! #define my_signal(A,B) pthread_signal((A),(void (*)(int)) (B))
+  #define my_pthread_attr_setprio(A,B)
+  #endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
+  
+***************
+*** 324,337 ****
+  #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
+  int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
+  #endif
+! #if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)
+! #define sigset(A,B) do { struct sigaction s; sigset_t set;              \
+!                          sigemptyset(&set);                             \
+!                          s.sa_handler = (B);                            \
+!                          s.sa_mask    = set;                            \
+!                          s.sa_flags   = 0;                              \
+!                          sigaction((A), &s, (struct sigaction *) NULL); \
+                         } while (0)
+  #endif
+  
+  #ifndef my_pthread_setprio
+--- 332,358 ----
+  #if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
+  int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
+  #endif
+! 
+! /*
+!   We define my_sigset() and use that instead of the system sigset() so that
+!   we can favor an implementation based on sigaction(). On some systems, such
+!   as Mac OS X, sigset() results in flags such as SA_RESTART being set, and
+!   we want to make sure that no such flags are set.
+! */
+! #if defined(HAVE_SIGACTION) && !defined(my_sigset)
+! #define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc;      \
+!                             DBUG_ASSERT((A) != 0);                         \
+!                             sigemptyset(&set);                             \
+!                             s.sa_handler = (B);                            \
+!                             s.sa_mask    = set;                            \
+!                             s.sa_flags   = 0;                              \
+!                             rc= sigaction((A), &s, (struct sigaction *) NULL); \
+!                             DBUG_ASSERT(rc == 0);                          \
+                         } while (0)
++ #elif defined(HAVE_SIGSET) && !defined(my_sigset)
++ #define my_sigset(A,B) sigset((A),(B))
++ #elif !defined(my_sigset)
++ #define my_sigset(A,B) signal((A),(B))
+  #endif
+  
+  #ifndef my_pthread_setprio
+***************
+*** 416,422 ****
+  #undef	pthread_detach_this_thread
+  #define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
+  #undef sigset
+! #define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
+  #endif
+  
+  #if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)
+--- 437,443 ----
+  #undef	pthread_detach_this_thread
+  #define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
+  #undef sigset
+! #define my_sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
+  #endif
+  
+  #if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)

include/thr_alarm.h

@@ -24,11 +24,6 @@ extern "C" {
 #ifndef USE_ALARM_THREAD
 #define USE_ONE_SIGNAL_HAND		/* One must call process_alarm */
 #endif
-#ifdef HAVE_LINUXTHREADS
-#define THR_CLIENT_ALARM SIGALRM
-#else
-#define THR_CLIENT_ALARM SIGUSR1
-#endif
 #ifdef HAVE_rts_threads
 #undef USE_ONE_SIGNAL_HAND
 #define USE_ALARM_THREAD
@@ -97,6 +92,9 @@ typedef struct st_alarm {
   my_bool malloced;
 } ALARM;
 
+extern uint thr_client_alarm;
+extern pthread_t alarm_thread;
+
 #define thr_alarm_init(A) (*(A))=0
 #define thr_alarm_in_use(A) (*(A)!= 0)
 void init_thr_alarm(uint max_alarm);

mysql-test/r/merge.result

@@ -772,7 +772,7 @@ CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(2),(1);
 CREATE TABLE t2(a INT, KEY(a)) ENGINE=MERGE UNION=(t1);
 SELECT * FROM t2 WHERE a=2;
-ERROR HY000: Got error 124 from storage engine
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
 DROP TABLE t1, t2;
 CREATE TABLE t1(a INT) ENGINE=MEMORY;
 CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
@@ -783,6 +783,26 @@ CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
 SELECT * FROM t2;
 ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
 DROP TABLE t2;
+CREATE TABLE t1(a INT, b TEXT);
+CREATE TABLE tm1(a TEXT, b INT) ENGINE=MERGE UNION=(t1);
+SELECT * FROM tm1;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+DROP TABLE t1, tm1;
+CREATE TABLE t1(a SMALLINT, b SMALLINT);
+CREATE TABLE tm1(a INT) ENGINE=MERGE UNION=(t1);
+SELECT * FROM tm1;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+DROP TABLE t1, tm1;
+CREATE TABLE t1(a SMALLINT, b SMALLINT, KEY(a, b));
+CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
+SELECT * FROM tm1;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+DROP TABLE t1, tm1;
+CREATE TABLE t1(a SMALLINT, b SMALLINT, KEY(b));
+CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
+SELECT * FROM tm1;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+DROP TABLE t1, tm1;
 create table t1 (b bit(1));
 create table t2 (b bit(1));
 create table tm (b bit(1)) engine = merge union = (t1,t2);

mysql-test/t/merge.test

@@ -385,7 +385,7 @@ drop table t1, t2, t3;
 CREATE TABLE t1(a INT);
 INSERT INTO t1 VALUES(2),(1);
 CREATE TABLE t2(a INT, KEY(a)) ENGINE=MERGE UNION=(t1);
---error 1030
+--error 1168
 SELECT * FROM t2 WHERE a=2;
 DROP TABLE t1, t2;
 
@@ -403,6 +403,33 @@ CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
 SELECT * FROM t2;
 DROP TABLE t2;
 
+#
+# Underlying table definition conformance tests.
+#
+CREATE TABLE t1(a INT, b TEXT);
+CREATE TABLE tm1(a TEXT, b INT) ENGINE=MERGE UNION=(t1);
+--error 1168
+SELECT * FROM tm1;
+DROP TABLE t1, tm1;
+
+CREATE TABLE t1(a SMALLINT, b SMALLINT);
+CREATE TABLE tm1(a INT) ENGINE=MERGE UNION=(t1);
+--error 1168
+SELECT * FROM tm1;
+DROP TABLE t1, tm1;
+
+CREATE TABLE t1(a SMALLINT, b SMALLINT, KEY(a, b));
+CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
+--error 1168
+SELECT * FROM tm1;
+DROP TABLE t1, tm1;
+
+CREATE TABLE t1(a SMALLINT, b SMALLINT, KEY(b));
+CREATE TABLE tm1(a SMALLINT, b SMALLINT, KEY(a)) ENGINE=MERGE UNION=(t1);
+--error 1168
+SELECT * FROM tm1;
+DROP TABLE t1, tm1;
+
 # End of 4.1 tests
 
 #

mysys/my_pthread.c

@@ -29,6 +29,8 @@
 #define SCHED_POLICY SCHED_OTHER
 #endif
 
+uint thd_lib_detected;
+
 #ifndef my_pthread_setprio
 void my_pthread_setprio(pthread_t thread_id,int prior)
 {
@@ -315,8 +317,6 @@ void sigwait_handle_sig(int sig)
   pthread_mutex_unlock(&LOCK_sigwait);
 }
 
-extern pthread_t alarm_thread;
-
 void *sigwait_thread(void *set_arg)
 {
   sigset_t *set=(sigset_t*) set_arg;
@@ -335,7 +335,9 @@ void *sigwait_thread(void *set_arg)
       sigaction(i, &sact, (struct sigaction*) 0);
     }
   }
-  sigaddset(set,THR_CLIENT_ALARM);
+  /* Ensure that init_thr_alarm() is called */
+  DBUG_ASSERT(thr_client_alarm);
+  sigaddset(set, thr_client_alarm);
   pthread_sigmask(SIG_UNBLOCK,(sigset_t*) set,(sigset_t*) 0);
   alarm_thread=pthread_self();			/* For thr_alarm */
 

mysys/my_thr_init.c

@@ -20,6 +20,7 @@
 
 #include "mysys_priv.h"
 #include <m_string.h>
+#include <signal.h>
 
 #ifdef THREAD
 #ifdef USE_TLS
@@ -63,6 +64,8 @@ pthread_handler_t nptl_pthread_exit_hack_handler(void *arg)
 
 #endif
 
+static uint get_thread_lib(void);
+
 /*
   initialize thread environment
 
@@ -76,6 +79,8 @@ pthread_handler_t nptl_pthread_exit_hack_handler(void *arg)
 
 my_bool my_thread_global_init(void)
 {
+  thd_lib_detected= get_thread_lib();
+
   if (pthread_key_create(&THR_KEY_mysys,0))
   {
     fprintf(stderr,"Can't initialize threads: error %d\n",errno);
@@ -392,4 +397,20 @@ const char *my_thread_name(void)
 }
 #endif /* DBUG_OFF */
 
+
+static uint get_thread_lib(void)
+{
+  char buff[64];
+    
+#ifdef _CS_GNU_LIBPTHREAD_VERSION
+  confstr(_CS_GNU_LIBPTHREAD_VERSION, buff, sizeof(buff));
+
+  if (!strncasecmp(buff, "NPTL", 4))
+    return THD_LIB_NPTL;
+  if (!strncasecmp(buff, "linuxthreads", 12))
+    return THD_LIB_LT;
+#endif
+  return THD_LIB_OTHER;
+}
+
 #endif /* THREAD */

mysys/thr_alarm.c

@@ -35,6 +35,7 @@
 #define ETIME ETIMEDOUT
 #endif
 
+uint thr_client_alarm;
 static int alarm_aborted=1;			/* No alarm thread */
 my_bool thr_alarm_inited= 0;
 volatile my_bool alarm_thread_running= 0;
@@ -57,9 +58,7 @@ static void *alarm_handler(void *arg);
 #define reschedule_alarms() pthread_kill(alarm_thread,THR_SERVER_ALARM)
 #endif
 
-#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
 static sig_handler thread_alarm(int sig __attribute__((unused)));
-#endif
 
 static int compare_ulong(void *not_used __attribute__((unused)),
 			 byte *a_ptr,byte* b_ptr)
@@ -78,9 +77,16 @@ void init_thr_alarm(uint max_alarms)
   sigfillset(&full_signal_set);			/* Neaded to block signals */
   pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
   pthread_cond_init(&COND_alarm,NULL);
-#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
-  my_sigset(THR_CLIENT_ALARM,thread_alarm);
+  if (thd_lib_detected == THD_LIB_LT)
+    thr_client_alarm= SIGALRM;
+  else
+    thr_client_alarm= SIGUSR1;
+#ifndef USE_ALARM_THREAD
+  if (thd_lib_detected != THD_LIB_LT)
 #endif
+  {
+    my_sigset(thr_client_alarm, thread_alarm);
+  }
   sigemptyset(&s);
   sigaddset(&s, THR_SERVER_ALARM);
   alarm_thread=pthread_self();
@@ -98,10 +104,11 @@ void init_thr_alarm(uint max_alarms)
   }
 #elif defined(USE_ONE_SIGNAL_HAND)
   pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
-#if THR_SERVER_ALARM == THR_CLIENT_ALARM
-  my_sigset(THR_CLIENT_ALARM,process_alarm);	/* Linuxthreads */
-  pthread_sigmask(SIG_UNBLOCK, &s, NULL);
-#endif
+  if (thd_lib_detected == THD_LIB_LT)
+  {
+    my_sigset(thr_client_alarm, process_alarm);        /* Linuxthreads */
+    pthread_sigmask(SIG_UNBLOCK, &s, NULL);
+  }
 #else
   my_sigset(THR_SERVER_ALARM, process_alarm);
   pthread_sigmask(SIG_UNBLOCK, &s, NULL);
@@ -152,7 +159,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm_data)
 
   now=(ulong) time((time_t*) 0);
   pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask);
-  pthread_mutex_lock(&LOCK_alarm);	/* Lock from threads & alarms */
+  pthread_mutex_lock(&LOCK_alarm);        /* Lock from threads & alarms */
   if (alarm_aborted > 0)
   {					/* No signal thread */
     DBUG_PRINT("info", ("alarm aborted"));
@@ -272,18 +279,17 @@ sig_handler process_alarm(int sig __attribute__((unused)))
   This must be first as we can't call DBUG inside an alarm for a normal thread
 */
 
-#if THR_SERVER_ALARM == THR_CLIENT_ALARM
-  if (!pthread_equal(pthread_self(),alarm_thread))
+  if (thd_lib_detected == THD_LIB_LT &&
+      !pthread_equal(pthread_self(),alarm_thread))
   {
 #if defined(MAIN) && !defined(__bsdi__)
-    printf("thread_alarm\n"); fflush(stdout);
+    printf("thread_alarm in process_alarm\n"); fflush(stdout);
 #endif
 #ifdef DONT_REMEMBER_SIGNAL
-    my_sigset(THR_CLIENT_ALARM,process_alarm);	/* int. thread system calls */
+    my_sigset(thr_client_alarm, process_alarm);	/* int. thread system calls */
 #endif
     return;
   }
-#endif
 
   /*
     We have to do do the handling of the alarm in a sub function,
@@ -327,7 +333,7 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
 	alarm_data=(ALARM*) queue_element(&alarm_queue,i);
 	alarm_data->alarmed=1;			/* Info to thread */
 	if (pthread_equal(alarm_data->thread,alarm_thread) ||
-	    pthread_kill(alarm_data->thread, THR_CLIENT_ALARM))
+	    pthread_kill(alarm_data->thread, thr_client_alarm))
 	{
 #ifdef MAIN
 	  printf("Warning: pthread_kill couldn't find thread!!!\n");
@@ -351,7 +357,7 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
 	alarm_data->alarmed=1;			/* Info to thread */
 	DBUG_PRINT("info",("sending signal to waiting thread"));
 	if (pthread_equal(alarm_data->thread,alarm_thread) ||
-	    pthread_kill(alarm_data->thread, THR_CLIENT_ALARM))
+	    pthread_kill(alarm_data->thread, thr_client_alarm))
 	{
 #ifdef MAIN
 	  printf("Warning: pthread_kill couldn't find thread!!!\n");
@@ -488,7 +494,7 @@ void thr_alarm_info(ALARM_INFO *info)
   ARGSUSED
 */
 
-#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
+
 static sig_handler thread_alarm(int sig)
 {
 #ifdef MAIN
@@ -498,7 +504,6 @@ static sig_handler thread_alarm(int sig)
   my_sigset(sig,thread_alarm);		/* int. thread system calls */
 #endif
 }
-#endif
 
 
 #ifdef HAVE_TIMESPEC_TS_SEC
@@ -926,9 +931,7 @@ static void *signal_hand(void *arg __attribute__((unused)))
   sigaddset(&set,SIGINT);
   sigaddset(&set,SIGQUIT);
   sigaddset(&set,SIGTERM);
-#if THR_CLIENT_ALARM != SIGHUP
   sigaddset(&set,SIGHUP);
-#endif
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
@@ -940,7 +943,7 @@ static void *signal_hand(void *arg __attribute__((unused)))
 #endif
 #endif /* OS2 */
   printf("server alarm: %d  thread alarm: %d\n",
-	 THR_SERVER_ALARM,THR_CLIENT_ALARM);
+         THR_SERVER_ALARM, thr_client_alarm);
   DBUG_PRINT("info",("Starting signal and alarm handling thread"));
   for(;;)
   {
@@ -1012,11 +1015,11 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
   sigaddset(&set,SIGTSTP);
 #endif
   sigaddset(&set,THR_SERVER_ALARM);
-  sigdelset(&set,THR_CLIENT_ALARM);
+  sigdelset(&set, thr_client_alarm);
   (void) pthread_sigmask(SIG_SETMASK,&set,NULL);
 #ifdef NOT_USED
   sigemptyset(&set);
-  sigaddset(&set,THR_CLIENT_ALARM);
+  sigaddset(&set, thr_client_alarm);
   VOID(pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0));
 #endif
 #endif /* OS2 */
@@ -1066,8 +1069,8 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
     }
   }
   pthread_mutex_unlock(&LOCK_thread_count);
-  end_thr_alarm(1);
   thr_alarm_info(&alarm_info);
+  end_thr_alarm(1);
   printf("Main_thread:  Alarms: %u  max_alarms: %u  next_alarm_time: %lu\n",
 	 alarm_info.active_alarms, alarm_info.max_used_alarms,
 	 alarm_info.next_alarm_time);

mysys/thr_alarm.c.rej

+***************
+*** 76,96 ****
+    alarm_aborted=0;
+    init_queue(&alarm_queue,max_alarms+1,offsetof(ALARM,expire_time),0,
+  	     compare_ulong,NullS);
+!   sigfillset(&full_signal_set);			/* Neaded to block signals */
+    pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
+    pthread_cond_init(&COND_alarm,NULL);
+! #if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
+! #if defined(HAVE_mit_thread)
+!   sigset(THR_CLIENT_ALARM,thread_alarm);	/* int. thread system calls */
+! #else
+    {
+!     struct sigaction sact;
+!     sact.sa_flags = 0;
+!     sact.sa_handler = thread_alarm;
+!     sigaction(THR_CLIENT_ALARM, &sact, (struct sigaction*) 0);
+    }
+- #endif
+- #endif
+    sigemptyset(&s);
+    sigaddset(&s, THR_SERVER_ALARM);
+    alarm_thread=pthread_self();
+--- 74,89 ----
+    alarm_aborted=0;
+    init_queue(&alarm_queue,max_alarms+1,offsetof(ALARM,expire_time),0,
+  	     compare_ulong,NullS);
+!   sigfillset(&full_signal_set);			/* Needed to block signals */
+    pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
+    pthread_cond_init(&COND_alarm,NULL);
+! #ifndef USE_ALARM_THREAD
+!   if (thd_lib_detected != THD_LIB_LT)
+! #endif
+    {
+!     my_sigset(thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1,
+! 	      thread_alarm);
+    }
+    sigemptyset(&s);
+    sigaddset(&s, THR_SERVER_ALARM);
+    alarm_thread=pthread_self();
+***************
+*** 108,120 ****
+    }
+  #elif defined(USE_ONE_SIGNAL_HAND)
+    pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
+! #if THR_SERVER_ALARM == THR_CLIENT_ALARM
+!   sigset(THR_CLIENT_ALARM,process_alarm);	/* Linuxthreads */
+!   pthread_sigmask(SIG_UNBLOCK, &s, NULL);
+! #endif
+  #else
+    pthread_sigmask(SIG_UNBLOCK, &s, NULL);
+-   sigset(THR_SERVER_ALARM,process_alarm);
+  #endif
+    DBUG_VOID_RETURN;
+  }
+--- 101,115 ----
+    }
+  #elif defined(USE_ONE_SIGNAL_HAND)
+    pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
+!   if (thd_lib_detected == THD_LIB_LT)
+!   {
+!     my_sigset(thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1,
+!               process_alarm);        /* Linuxthreads */
+!     pthread_sigmask(SIG_UNBLOCK, &s, NULL);
+!   }
+  #else
++   my_sigset(THR_SERVER_ALARM, process_alarm);
+    pthread_sigmask(SIG_UNBLOCK, &s, NULL);
+  #endif
+    DBUG_VOID_RETURN;
+  }
+***************
+*** 240,246 ****
+        if (alarm_data->malloced)
+  	my_free((gptr) alarm_data,MYF(0));
+        found++;
+! #ifndef DBUG_OFF
+        break;
+  #endif
+      }
+--- 235,241 ----
+        if (alarm_data->malloced)
+  	my_free((gptr) alarm_data,MYF(0));
+        found++;
+! #ifdef DBUG_OFF
+        break;
+  #endif
+      }
+***************
+*** 249,258 ****
+    if (!found)
+    {
+      if (*alarmed)
+!       fprintf(stderr,"Warning: Didn't find alarm %lx in queue of %d alarms\n",
+! 	      (long) *alarmed, alarm_queue.elements);
+!     DBUG_PRINT("warning",("Didn't find alarm %lx in queue\n",
+! 			  (long) *alarmed));
+    }
+    pthread_mutex_unlock(&LOCK_alarm);
+    pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
+--- 244,254 ----
+    if (!found)
+    {
+      if (*alarmed)
+!       fprintf(stderr,
+!               "Warning: Didn't find alarm 0x%lx in queue of %d alarms\n",
+!               (long) *alarmed, alarm_queue.elements);
+!     DBUG_PRINT("warning",("Didn't find alarm 0x%lx in queue\n",
+!                          (long) *alarmed));
+    }
+    pthread_mutex_unlock(&LOCK_alarm);
+    pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
+***************
+*** 274,291 ****
+    This must be first as we can't call DBUG inside an alarm for a normal thread
+  */
+  
+! #if THR_SERVER_ALARM == THR_CLIENT_ALARM
+!   if (!pthread_equal(pthread_self(),alarm_thread))
+    {
+  #if defined(MAIN) && !defined(__bsdi__)
+!     printf("thread_alarm\n"); fflush(stdout);
+  #endif
+  #ifdef DONT_REMEMBER_SIGNAL
+!     sigset(THR_CLIENT_ALARM,process_alarm);	/* int. thread system calls */
+  #endif
+      return;
+    }
+- #endif
+  
+    /*
+      We have to do do the handling of the alarm in a sub function,
+--- 270,287 ----
+    This must be first as we can't call DBUG inside an alarm for a normal thread
+  */
+  
+!   if (thd_lib_detected == THD_LIB_LT &&
+!       !pthread_equal(pthread_self(),alarm_thread))
+    {
+  #if defined(MAIN) && !defined(__bsdi__)
+!     printf("thread_alarm in process_alarm\n"); fflush(stdout);
+  #endif
+  #ifdef DONT_REMEMBER_SIGNAL
+!     my_sigset(thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1,
+!               process_alarm);	/* int. thread system calls */
+  #endif
+      return;
+    }
+  
+    /*
+      We have to do do the handling of the alarm in a sub function,
+***************
+*** 301,307 ****
+    process_alarm_part2(sig);
+  #ifndef USE_ALARM_THREAD
+  #if defined(DONT_REMEMBER_SIGNAL) && !defined(USE_ONE_SIGNAL_HAND)
+!   sigset(THR_SERVER_ALARM,process_alarm);
+  #endif
+    pthread_mutex_unlock(&LOCK_alarm);
+    pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
+--- 297,303 ----
+    process_alarm_part2(sig);
+  #ifndef USE_ALARM_THREAD
+  #if defined(DONT_REMEMBER_SIGNAL) && !defined(USE_ONE_SIGNAL_HAND)
+!   my_sigset(THR_SERVER_ALARM, process_alarm);
+  #endif
+    pthread_mutex_unlock(&LOCK_alarm);
+    pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
+***************
+*** 504,520 ****
+    ARGSUSED
+  */
+  
+- #if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
+  static sig_handler thread_alarm(int sig)
+  {
+  #ifdef MAIN
+    printf("thread_alarm\n"); fflush(stdout);
+  #endif
+  #ifdef DONT_REMEMBER_SIGNAL
+!   sigset(sig,thread_alarm);		/* int. thread system calls */
+  #endif
+  }
+- #endif
+  
+  
+  #ifdef HAVE_TIMESPEC_TS_SEC
+--- 499,513 ----
+    ARGSUSED
+  */
+  
+  static sig_handler thread_alarm(int sig)
+  {
+  #ifdef MAIN
+    printf("thread_alarm\n"); fflush(stdout);
+  #endif
+  #ifdef DONT_REMEMBER_SIGNAL
+!   my_sigset(sig, thread_alarm);		/* int. thread system calls */
+  #endif
+  }
+  
+  
+  #ifdef HAVE_TIMESPEC_TS_SEC
+***************
+*** 915,921 ****
+    printf("Warning: Got signal %d from thread %s\n",sig,my_thread_name());
+    fflush(stdout);
+  #ifdef DONT_REMEMBER_SIGNAL
+!   sigset(sig,print_signal_warning);		/* int. thread system calls */
+  #endif
+  #ifndef OS2
+    if (sig == SIGALRM)
+--- 908,914 ----
+    printf("Warning: Got signal %d from thread %s\n",sig,my_thread_name());
+    fflush(stdout);
+  #ifdef DONT_REMEMBER_SIGNAL
+!   my_sigset(sig, print_signal_warning);         /* int. thread system calls */
+  #endif
+  #ifndef OS2
+    if (sig == SIGALRM)

sql/ha_myisammrg.cc

@@ -66,6 +66,12 @@ static const char *ha_myisammrg_exts[] = {
   ".MRG",
   NullS
 };
+extern int table2myisam(TABLE *table_arg, MI_KEYDEF **keydef_out,
+                        MI_COLUMNDEF **recinfo_out, uint *records_out);
+extern int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo,
+                            uint t1_keys, uint t1_recs,
+                            MI_KEYDEF *t2_keyinfo, MI_COLUMNDEF *t2_recinfo,
+                            uint t2_keys, uint t2_recs, bool strict);
 
 const char **ha_myisammrg::bas_ext() const
 {
@@ -87,6 +93,12 @@ const char *ha_myisammrg::index_type(uint key_number)
 
 int ha_myisammrg::open(const char *name, int mode, uint test_if_locked)
 {
+  MI_KEYDEF *keyinfo;
+  MI_COLUMNDEF *recinfo;
+  MYRG_TABLE *u_table;
+  uint recs;
+  uint keys= table->s->keys;
+  int error;
   char name_buff[FN_REFLEN];
 
   DBUG_PRINT("info", ("ha_myisammrg::open"));
@@ -109,18 +121,43 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked)
   {
     DBUG_PRINT("error",("reclength: %lu  mean_rec_length: %lu",
 			table->s->reclength, mean_rec_length));
+    error= HA_ERR_WRONG_MRG_TABLE_DEF;
     goto err;
   }
+  if ((error= table2myisam(table, &keyinfo, &recinfo, &recs)))
+  {
+    /* purecov: begin inspected */
+    DBUG_PRINT("error", ("Failed to convert TABLE object to MyISAM "
+                         "key and column definition"));
+    goto err;
+    /* purecov: end */
+  }
+  for (u_table= file->open_tables; u_table < file->end_table; u_table++)
+  {
+    if (check_definition(keyinfo, recinfo, keys, recs,
+                         u_table->table->s->keyinfo, u_table->table->s->rec,
+                         u_table->table->s->base.keys,
+                         u_table->table->s->base.fields, false))
+    {
+      my_free((gptr) recinfo, MYF(0));
+      error= HA_ERR_WRONG_MRG_TABLE_DEF;
+      goto err;
+    }
+  }
+  my_free((gptr) recinfo, MYF(0));
 #if !defined(BIG_TABLES) || SIZEOF_OFF_T == 4
   /* Merge table has more than 2G rows */
   if (table->s->crashed)
+  {
+    error= HA_ERR_WRONG_MRG_TABLE_DEF;
     goto err;
+  }
 #endif
   return (0);
 err:
   myrg_close(file);
   file=0;
-  return (my_errno= HA_ERR_WRONG_MRG_TABLE_DEF);
+  return (my_errno= error);
 }
 
 int ha_myisammrg::close(void)

sql/mysqld.cc

@@ -198,12 +198,6 @@ inline void reset_floating_point_exceptions()
 
 } /* cplusplus */
 
-
-#if defined(HAVE_LINUXTHREADS)
-#define THR_KILL_SIGNAL SIGINT
-#else
-#define THR_KILL_SIGNAL SIGUSR2		// Can't use this with LinuxThreads
-#endif
 #define MYSQL_KILL_SIGNAL SIGTERM
 
 #ifdef HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
@@ -523,6 +517,7 @@ rw_lock_t	LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
 pthread_cond_t COND_refresh,COND_thread_count, COND_global_read_lock;
 pthread_t signal_thread;
 pthread_attr_t connection_attrib;
+static uint thr_kill_signal;
 
 File_parser_dummy_hook file_parser_dummy_hook;
 
@@ -698,7 +693,7 @@ static void close_connections(void)
     DBUG_PRINT("info",("Waiting for select thread"));
 
 #ifndef DONT_USE_THR_ALARM
-    if (pthread_kill(select_thread,THR_CLIENT_ALARM))
+    if (pthread_kill(select_thread, thr_client_alarm))
       break;					// allready dead
 #endif
     set_timespec(abstime, 2);
@@ -2154,7 +2149,9 @@ static void init_signals(void)
   DBUG_ENTER("init_signals");
 
   if (test_flags & TEST_SIGINT)
-    my_sigset(THR_KILL_SIGNAL,end_thread_signal);
+  {
+    my_sigset(thr_kill_signal, end_thread_signal);
+  }
   my_sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
 
   if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
@@ -2211,8 +2208,12 @@ static void init_signals(void)
 #endif
   sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
-    sigdelset(&set,THR_KILL_SIGNAL);		// May be SIGINT
-  sigdelset(&set,THR_CLIENT_ALARM);		// For alarms
+  {
+    // May be SIGINT
+    sigdelset(&set, thr_kill_signal);
+  }
+  // For alarms
+  sigdelset(&set, thr_client_alarm);
   sigprocmask(SIG_SETMASK,&set,NULL);
   pthread_sigmask(SIG_SETMASK,&set,NULL);
   DBUG_VOID_RETURN;
@@ -2276,23 +2277,19 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
   */
   init_thr_alarm(max_connections +
 		 global_system_variables.max_insert_delayed_threads + 10);
-#if SIGINT != THR_KILL_SIGNAL
-  if (test_flags & TEST_SIGINT)
+  if (thd_lib_detected != THD_LIB_LT && (test_flags & TEST_SIGINT))
   {
     (void) sigemptyset(&set);			// Setup up SIGINT for debug
     (void) sigaddset(&set,SIGINT);		// For debugging
     (void) pthread_sigmask(SIG_UNBLOCK,&set,NULL);
   }
-#endif
   (void) sigemptyset(&set);			// Setup up SIGINT for debug
 #ifdef USE_ONE_SIGNAL_HAND
   (void) sigaddset(&set,THR_SERVER_ALARM);	// For alarms
 #endif
 #ifndef IGNORE_SIGHUP_SIGQUIT
   (void) sigaddset(&set,SIGQUIT);
-#if THR_CLIENT_ALARM != SIGHUP
   (void) sigaddset(&set,SIGHUP);
-#endif
 #endif
   (void) sigaddset(&set,SIGTERM);
   (void) sigaddset(&set,SIGTSTP);
@@ -3351,6 +3348,9 @@ int main(int argc, char **argv)
 
   DEBUGGER_OFF;
 
+  /* Set signal used to kill MySQL */
+  thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
+
 #ifdef _CUSTOMSTARTUPCONFIG_
   if (_cust_check_startup())
   {

sql/mysqld.cc.rej

+***************
+*** 177,188 ****
+  } /* cplusplus */
+  
+  
+- #if defined(HAVE_LINUXTHREADS)
+- #define THR_KILL_SIGNAL SIGINT
+- #else
+- #define THR_KILL_SIGNAL SIGUSR2		// Can't use this with LinuxThreads
+- #endif
+- 
+  #ifdef HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
+  #include <sys/types.h>
+  #else
+--- 177,182 ----
+  } /* cplusplus */
+  
+  
+  #ifdef HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
+  #include <sys/types.h>
+  #else
+***************
+*** 505,510 ****
+  static void clean_up_mutexes(void);
+  static int test_if_case_insensitive(const char *dir_name);
+  static void create_pid_file();
+  
+  /****************************************************************************
+  ** Code to end mysqld
+--- 499,505 ----
+  static void clean_up_mutexes(void);
+  static int test_if_case_insensitive(const char *dir_name);
+  static void create_pid_file();
++ static uint get_thread_lib(void);
+  
+  /****************************************************************************
+  ** Code to end mysqld
+***************
+*** 544,550 ****
+      DBUG_PRINT("info",("Waiting for select_thread"));
+  
+  #ifndef DONT_USE_THR_ALARM
+!     if (pthread_kill(select_thread,THR_CLIENT_ALARM))
+        break;					// allready dead
+  #endif
+      set_timespec(abstime, 2);
+--- 539,546 ----
+      DBUG_PRINT("info",("Waiting for select_thread"));
+  
+  #ifndef DONT_USE_THR_ALARM
+!     if (pthread_kill(select_thread,
+! 		     thd_lib_detected == THD_LIB_LT ? SIGALRM : SIGUSR1))
+        break;					// allready dead
+  #endif
+      set_timespec(abstime, 2);
+***************
+*** 844,850 ****
+  		      sig,my_thread_id());
+    }
+  #ifdef DONT_REMEMBER_SIGNAL
+!   sigset(sig,print_signal_warning);		/* int. thread system calls */
+  #endif
+  #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+    if (sig == SIGALRM)
+--- 840,846 ----
+  		      sig,my_thread_id());
+    }
+  #ifdef DONT_REMEMBER_SIGNAL
+!   my_sigset(sig, print_signal_warning);         /* int. thread system calls */
+  #endif
+  #if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
+    if (sig == SIGALRM)
+***************
+*** 1841,1848 ****
+    DBUG_ENTER("init_signals");
+  
+    if (test_flags & TEST_SIGINT)
+!     sigset(THR_KILL_SIGNAL,end_thread_signal);
+!   sigset(THR_SERVER_ALARM,print_signal_warning); // Should never be called!
+  
+    if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
+    {
+--- 1837,1847 ----
+    DBUG_ENTER("init_signals");
+  
+    if (test_flags & TEST_SIGINT)
+!   {
+!     my_sigset(thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2,
+!               end_thread_signal);
+!   }
+!   my_sigset(THR_SERVER_ALARM, print_signal_warning); // Should never be called!
+  
+    if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL))
+    {
+***************
+*** 1877,1883 ****
+  #endif
+    (void) sigemptyset(&set);
+  #ifdef THREAD_SPECIFIC_SIGPIPE
+!   sigset(SIGPIPE,abort_thread);
+    sigaddset(&set,SIGPIPE);
+  #else
+    (void) signal(SIGPIPE,SIG_IGN);		// Can't know which thread
+--- 1876,1882 ----
+  #endif
+    (void) sigemptyset(&set);
+  #ifdef THREAD_SPECIFIC_SIGPIPE
+!   my_sigset(SIGPIPE, abort_thread);
+    sigaddset(&set,SIGPIPE);
+  #else
+    (void) signal(SIGPIPE,SIG_IGN);		// Can't know which thread
+***************
+*** 2237,2244 ****
+    MY_INIT(argv[0]);		// init my_sys library & pthreads
+    tzset();			// Set tzname
+  
+    start_time=time((time_t*) 0);
+- 
+  #ifdef OS2
+    {
+      // fix timezone for daylight saving
+--- 2236,2243 ----
+    MY_INIT(argv[0]);		// init my_sys library & pthreads
+    tzset();			// Set tzname
+  
++   thd_lib_detected= get_thread_lib();
+    start_time=time((time_t*) 0);
+  #ifdef OS2
+    {
+      // fix timezone for daylight saving
+***************
+*** 5547,5552 ****
+      (void) my_write(file, (byte*) buff, (uint) (end-buff),MYF(MY_WME));
+      (void) my_close(file, MYF(0));
+    }
+  }
+  
+  
+--- 5546,5567 ----
+      (void) my_write(file, (byte*) buff, (uint) (end-buff),MYF(MY_WME));
+      (void) my_close(file, MYF(0));
+    }
++ }
++ 
++ 
++ static uint get_thread_lib(void)
++ {
++   char buff[64];
++     
++ #ifdef _CS_GNU_LIBPTHREAD_VERSION
++   confstr(_CS_GNU_LIBPTHREAD_VERSION, buff, sizeof(buff));
++ 
++   if (!strncasecmp(buff, "NPTL", 4))
++     return THD_LIB_NPTL;
++   else if (!strncasecmp(buff, "linuxthreads", 12))
++     return THD_LIB_LT;
++ #endif
++   return THD_LIB_OTHER;
+  }
+  
+