Merge work.mysql.com:/home/bk/mysql

into central.snake.net:/home/paul/mysql

innobase/include/page0types.h

@@ -12,6 +12,8 @@ Created 2/2/1994 Heikki Tuuri
 #include "univ.i"
 
 /* Type of the index page */
+/* The following define eliminates a name collision on HP-UX */
+#define page_t     ib_page_t
 typedef	byte		page_t;
 typedef struct page_search_struct	page_search_t;
 typedef struct page_cur_struct	page_cur_t;

innobase/os/os0thread.c

@@ -26,7 +26,16 @@ os_thread_get_curr_id(void)
 #ifdef __WIN__
 	return(GetCurrentThreadId());
 #else
-	return((os_thread_id_t) pthread_self());
+	pthread_t    pthr;
+
+	pthr = pthread_self();
+
+	/* TODO: in the future we have to change os_thread_id
+	   to pthread_t; the following cast may work in a wrong way on some
+	   systems if pthread_t is a struct; this is just a quick fix
+	   for HP-UX to eliminate a compiler warning */
+
+	return(*(os_thread_id_t*)((void*) (&pthr)));
 #endif
 }
 
@@ -65,9 +74,14 @@ os_thread_create(
 #else
 	int		ret;
 	os_thread_t	pthread;
+	pthread_attr_t  attr;
+
+        pthread_attr_init(&attr);
 
 	ret = pthread_create(&pthread, NULL, start_f, arg);
 
+	pthread_attr_destroy(&attr);
+
 	return(pthread);
 #endif
 }

innobase/srv/srv0srv.c

@@ -899,8 +899,8 @@ void
 srv_create_utility_threads(void)
 /*============================*/
 {
-	os_thread_t	thread;
-	os_thread_id_t	thr_id;
+/*      os_thread_t	thread;
+ 	os_thread_id_t	thr_id; */
 	ulint		i;
 
 	mutex_enter(&kernel_mutex);
@@ -911,9 +911,9 @@ srv_create_utility_threads(void)
 	mutex_exit(&kernel_mutex);
 
 	for (i = 0; i < 1; i++) {
-		thread = os_thread_create(srv_recovery_thread, NULL, &thr_id);
+	  /* thread = os_thread_create(srv_recovery_thread, NULL, &thr_id); */
 
-		ut_a(thread);
+	  /* ut_a(thread); */
 	}
 
 /*	thread = os_thread_create(srv_purge_thread, NULL, &thr_id);
@@ -978,15 +978,15 @@ void
 srv_create_com_threads(void)
 /*========================*/
 {
-	os_thread_t	thread;
-	os_thread_id_t	thr_id;
+  /*	os_thread_t	thread;
+	os_thread_id_t	thr_id; */
 	ulint		i;
 
 	srv_n_threads[SRV_COM] = srv_n_com_threads;
 
 	for (i = 0; i < srv_n_com_threads; i++) {
-		thread = os_thread_create(srv_com_thread, NULL, &thr_id);
-		ut_a(thread);
+	  /* thread = os_thread_create(srv_com_thread, NULL, &thr_id); */
+	  /* ut_a(thread); */
 	}
 }
 
@@ -1042,16 +1042,16 @@ void
 srv_create_worker_threads(void)
 /*===========================*/
 {
-	os_thread_t	thread;
-	os_thread_id_t	thr_id;
+/*	os_thread_t	thread;
+	os_thread_id_t	thr_id; */
 	ulint		i;
 
 	srv_n_threads[SRV_WORKER] = srv_n_worker_threads;
 	srv_n_threads_active[SRV_WORKER] = srv_n_worker_threads;
 
 	for (i = 0; i < srv_n_worker_threads; i++) {
-		thread = os_thread_create(srv_worker_thread, NULL, &thr_id);
-		ut_a(thread);
+	  /* thread = os_thread_create(srv_worker_thread, NULL, &thr_id); */
+	  /* ut_a(thread); */
 	}
 }
 

innobase/srv/srv0start.c

@@ -683,8 +683,8 @@ innobase_start_or_create_for_mysql(void)
 	}
 
 	if (srv_measure_contention) {
-		os_thread_create(&test_measure_cont, NULL, thread_ids +
-							SRV_MAX_N_IO_THREADS);
+	  /* os_thread_create(&test_measure_cont, NULL, thread_ids +
+                             	     SRV_MAX_N_IO_THREADS); */
 	}
 
 	/* Create the master thread which monitors the database