ut0mem.c Merge changes in InnoDB-3.23.43b

ut0ut.c 	Merge changes in InnoDB-3.23.43b
trx0purge.c	Merge changes in InnoDB-3.23.43b
trx0rec.c	Merge changes in InnoDB-3.23.43b
trx0trx.c	Merge changes in InnoDB-3.23.43b
trx0undo.c	Merge changes in InnoDB-3.23.43b
thr0loc.c	Merge changes in InnoDB-3.23.43b
sync0arr.c	Merge changes in InnoDB-3.23.43b
sync0rw.c	Merge changes in InnoDB-3.23.43b
sync0sync.c	Merge changes in InnoDB-3.23.43b
srv0srv.c	Merge changes in InnoDB-3.23.43b
srv0start.c	Merge changes in InnoDB-3.23.43b
row0ins.c	Merge changes in InnoDB-3.23.43b
row0mysql.c	Merge changes in InnoDB-3.23.43b
row0purge.c	Merge changes in InnoDB-3.23.43b
row0sel.c	Merge changes in InnoDB-3.23.43b
row0umod.c	Merge changes in InnoDB-3.23.43b
row0upd.c	Merge changes in InnoDB-3.23.43b
row0vers.c	Merge changes in InnoDB-3.23.43b
rem0cmp.c	Merge changes in InnoDB-3.23.43b
que0que.c	Merge changes in InnoDB-3.23.43b
pars0opt.c	Merge changes in InnoDB-3.23.43b
pars0pars.c	Merge changes in InnoDB-3.23.43b
lexyy.c 	Merge changes in InnoDB-3.23.43b
pars0grm.c	Merge changes in InnoDB-3.23.43b
page0page.c	Merge changes in InnoDB-3.23.43b
os0file.c	Merge changes in InnoDB-3.23.43b
mtr0log.c	Merge changes in InnoDB-3.23.43b
mem0pool.c	Merge changes in InnoDB-3.23.43b
log0log.c	Merge changes in InnoDB-3.23.43b
log0recv.c	Merge changes in InnoDB-3.23.43b
lock0lock.c	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.c	Merge changes in InnoDB-3.23.43b
fil0fil.c	Merge changes in InnoDB-3.23.43b
dict0crea.c	Merge changes in InnoDB-3.23.43b
dict0dict.c	Merge changes in InnoDB-3.23.43b
dict0load.c	Merge changes in InnoDB-3.23.43b
dict0mem.c	Merge changes in InnoDB-3.23.43b
data0data.c	Merge changes in InnoDB-3.23.43b
data0type.c	Merge changes in InnoDB-3.23.43b
buf0buf.c	Merge changes in InnoDB-3.23.43b
buf0lru.c	Merge changes in InnoDB-3.23.43b
btr0btr.c	Merge changes in InnoDB-3.23.43b
btr0cur.c	Merge changes in InnoDB-3.23.43b
btr0pcur.c	Merge changes in InnoDB-3.23.43b
btr0sea.c	Merge changes in InnoDB-3.23.43b
data0type.ic	Merge changes in InnoDB-3.23.43b
dict0dict.ic	Merge changes in InnoDB-3.23.43b
mtr0mtr.ic	Merge changes in InnoDB-3.23.43b
row0upd.ic	Merge changes in InnoDB-3.23.43b
sync0ipm.ic	Merge changes in InnoDB-3.23.43b
sync0rw.ic	Merge changes in InnoDB-3.23.43b
sync0sync.ic	Merge changes in InnoDB-3.23.43b
trx0rseg.ic	Merge changes in InnoDB-3.23.43b
btr0pcur.ic	Merge changes in InnoDB-3.23.43b
buf0buf.ic	Merge changes in InnoDB-3.23.43b
data0data.ic	Merge changes in InnoDB-3.23.43b
row0upd.h	Merge changes in InnoDB-3.23.43b
srv0srv.h	Merge changes in InnoDB-3.23.43b
sync0arr.h	Merge changes in InnoDB-3.23.43b
sync0rw.h	Merge changes in InnoDB-3.23.43b
sync0sync.h	Merge changes in InnoDB-3.23.43b
trx0trx.h	Merge changes in InnoDB-3.23.43b
ut0mem.h	Merge changes in InnoDB-3.23.43b
data0data.h	Merge changes in InnoDB-3.23.43b
data0type.h	Merge changes in InnoDB-3.23.43b
db0err.h	Merge changes in InnoDB-3.23.43b
dict0crea.h	Merge changes in InnoDB-3.23.43b
dict0dict.h	Merge changes in InnoDB-3.23.43b
dict0load.h	Merge changes in InnoDB-3.23.43b
dict0mem.h	Merge changes in InnoDB-3.23.43b
dict0types.h	Merge changes in InnoDB-3.23.43b
fil0fil.h	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.h	Merge changes in InnoDB-3.23.43b
lock0lock.h	Merge changes in InnoDB-3.23.43b
log0log.h	Merge changes in InnoDB-3.23.43b
mtr0mtr.h	Merge changes in InnoDB-3.23.43b
rem0cmp.h	Merge changes in InnoDB-3.23.43b
row0ins.h	Merge changes in InnoDB-3.23.43b
row0mysql.h	Merge changes in InnoDB-3.23.43b
btr0cur.h	Merge changes in InnoDB-3.23.43b
btr0pcur.h	Merge changes in InnoDB-3.23.43b
btr0sea.h	Merge changes in InnoDB-3.23.43b
buf0buf.h	Merge changes in InnoDB-3.23.43b
sql_table.cc	Merge changes in InnoDB-3.23.43b
sql_db.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.cc	Merge changes in InnoDB-3.23.43b
handler.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.h	Merge changes in InnoDB-3.23.43b
handler.h	Merge changes in InnoDB-3.23.43b


sql/ha_innobase.h:
  Merge changes in InnoDB-3.23.43b
sql/handler.h:
  Merge changes in InnoDB-3.23.43b
sql/ha_innobase.cc:
  Merge changes in InnoDB-3.23.43b
sql/handler.cc:
  Merge changes in InnoDB-3.23.43b
sql/sql_db.cc:
  Merge changes in InnoDB-3.23.43b
sql/sql_table.cc:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0cur.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0sea.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0data.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0type.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/db0err.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0crea.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0load.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0mem.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0types.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/fil0fil.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/ibuf0ibuf.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/lock0lock.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/log0log.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/rem0cmp.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0ins.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0mysql.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/srv0srv.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0arr.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/trx0trx.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/ut0mem.h:
  Merge changes in InnoDB-3.23.43b
innobase/include/btr0pcur.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/buf0buf.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0data.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/data0type.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/dict0dict.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/mtr0mtr.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/row0upd.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0ipm.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0rw.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/sync0sync.ic:
  Merge changes in InnoDB-3.23.43b
innobase/include/trx0rseg.ic:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0btr.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0cur.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0pcur.c:
  Merge changes in InnoDB-3.23.43b
innobase/btr/btr0sea.c:
  Merge changes in InnoDB-3.23.43b
innobase/buf/buf0buf.c:
  Merge changes in InnoDB-3.23.43b
innobase/buf/buf0lru.c:
  Merge changes in InnoDB-3.23.43b
innobase/data/data0data.c:
  Merge changes in InnoDB-3.23.43b
innobase/data/data0type.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0crea.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0dict.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0load.c:
  Merge changes in InnoDB-3.23.43b
innobase/dict/dict0mem.c:
  Merge changes in InnoDB-3.23.43b
innobase/fil/fil0fil.c:
  Merge changes in InnoDB-3.23.43b
innobase/ibuf/ibuf0ibuf.c:
  Merge changes in InnoDB-3.23.43b
innobase/lock/lock0lock.c:
  Merge changes in InnoDB-3.23.43b
innobase/log/log0log.c:
  Merge changes in InnoDB-3.23.43b
innobase/log/log0recv.c:
  Merge changes in InnoDB-3.23.43b
innobase/mem/mem0pool.c:
  Merge changes in InnoDB-3.23.43b
innobase/mtr/mtr0log.c:
  Merge changes in InnoDB-3.23.43b
innobase/os/os0file.c:
  Merge changes in InnoDB-3.23.43b
innobase/page/page0page.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/lexyy.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0grm.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0opt.c:
  Merge changes in InnoDB-3.23.43b
innobase/pars/pars0pars.c:
  Merge changes in InnoDB-3.23.43b
innobase/que/que0que.c:
  Merge changes in InnoDB-3.23.43b
innobase/rem/rem0cmp.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0ins.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0mysql.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0purge.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0sel.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0umod.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0upd.c:
  Merge changes in InnoDB-3.23.43b
innobase/row/row0vers.c:
  Merge changes in InnoDB-3.23.43b
innobase/srv/srv0srv.c:
  Merge changes in InnoDB-3.23.43b
innobase/srv/srv0start.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0arr.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0rw.c:
  Merge changes in InnoDB-3.23.43b
innobase/sync/sync0sync.c:
  Merge changes in InnoDB-3.23.43b
innobase/thr/thr0loc.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0purge.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0rec.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0trx.c:
  Merge changes in InnoDB-3.23.43b
innobase/trx/trx0undo.c:
  Merge changes in InnoDB-3.23.43b
innobase/ut/ut0mem.c:
  Merge changes in InnoDB-3.23.43b
innobase/ut/ut0ut.c:
  Merge changes in InnoDB-3.23.43b
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 325 insertions, 136 deletions

diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index ba556e1c050..eda96091279 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -30,6 +30,7 @@ Created 10/8/1995 Heikki Tuuri
 #include "ut0mem.h"
 #include "os0proc.h"
 #include "mem0mem.h"
+#include "mem0pool.h"
 #include "sync0sync.h"
 #include "sync0ipm.h"
 #include "thr0loc.h"
@@ -46,11 +47,14 @@ Created 10/8/1995 Heikki Tuuri
 #include "ibuf0ibuf.h"
 #include "buf0flu.h"
 #include "btr0sea.h"
+#include "dict0load.h"
 
 /* The following counter is incremented whenever there is some user activity
 in the server */
 ulint	srv_activity_count	= 0;
 
+char*	srv_main_thread_op_info = "";
+
 /* Server parameters which are read from the initfile */
 
 /* The following three are dir paths which are catenated before file
@@ -66,6 +70,11 @@ ulint*	srv_data_file_sizes = NULL;	/* size in database pages */
 
 ulint*  srv_data_file_is_raw_partition = NULL;
 
+/* If the following is TRUE we do not allow inserts etc. This protects
+the user from forgetting the 'newraw' keyword to my.cnf */
+
+ibool	srv_created_new_raw	= FALSE;
+
 char**	srv_log_group_home_dirs = NULL; 
 
 ulint	srv_n_log_groups	= ULINT_MAX;
@@ -75,6 +84,9 @@ ibool	srv_log_archive_on	= TRUE;
 ulint	srv_log_buffer_size	= ULINT_MAX;	/* size in database pages */ 
 ibool	srv_flush_log_at_trx_commit = TRUE;
 
+byte	srv_latin1_ordering[256];	/* The sort order table of the latin1
+					character set */
+
 ibool	srv_use_native_aio	= FALSE;
 		
 ulint	srv_pool_size		= ULINT_MAX;	/* size in database pages;
@@ -93,6 +105,11 @@ ulint	srv_lock_wait_timeout	= 1024 * 1024 * 1024;
 char*   srv_unix_file_flush_method_str = NULL;
 ulint   srv_unix_file_flush_method = 0;
 
+/* If the following is != 0 we do not allow inserts etc. This protects
+the user from forgetting  innodb_force_recovery keyword to my.cnf */
+
+ulint	srv_force_recovery	= 0;
+
 ibool	srv_use_doublewrite_buf	= TRUE;
 
 ibool   srv_set_thread_priorities = TRUE;
@@ -115,10 +132,15 @@ ulint	srv_n_rows_inserted		= 0;
 ulint	srv_n_rows_updated		= 0;
 ulint	srv_n_rows_deleted		= 0;
 ulint	srv_n_rows_read			= 0;
+ulint	srv_n_rows_inserted_old		= 0;
+ulint	srv_n_rows_updated_old		= 0;
+ulint	srv_n_rows_deleted_old		= 0;
+ulint	srv_n_rows_read_old		= 0;
 
 ibool	srv_print_innodb_monitor	= FALSE;
 ibool   srv_print_innodb_lock_monitor   = FALSE;
 ibool   srv_print_innodb_tablespace_monitor = FALSE;
+ibool   srv_print_innodb_table_monitor = FALSE;
 
 /* The parameters below are obsolete: */
 
@@ -1739,31 +1761,153 @@ srv_release_mysql_thread_if_suspended(
 }
 
 /*************************************************************************
-A thread which wakes up threads whose lock wait may have lasted too long. */
+A thread which wakes up threads whose lock wait may have lasted too long.
+This also prints the info output by various InnoDB monitors. */
 
 #ifndef __WIN__
 void*
 #else
 ulint
 #endif
-srv_lock_timeout_monitor_thread(
-/*============================*/
+srv_lock_timeout_and_monitor_thread(
+/*================================*/
 			/* out: a dummy parameter */
 	void*	arg)	/* in: a dummy parameter required by
 			os_thread_create */
 {
+	double		time_elapsed;
+	time_t          current_time;
+	time_t          last_monitor_time;
 	ibool		some_waits;
 	srv_slot_t*	slot;
 	double		wait_time;
 	ulint		i;
 
 	UT_NOT_USED(arg);
+	last_monitor_time = time(NULL);
 loop:
 	/* When someone is waiting for a lock, we wake up every second
 	and check if a timeout has passed for a lock wait */
 
-	os_thread_sleep(1000000);
-			
+	os_thread_sleep(1000000);		
+
+	/* In case mutex_exit is not a memory barrier, it is
+	theoretically possible some threads are left waiting though
+	the semaphore is already released. Wake up those threads: */
+	
+	sync_arr_wake_threads_if_sema_free();
+
+	current_time = time(NULL);
+
+	time_elapsed = difftime(current_time, last_monitor_time);
+	
+	if (time_elapsed > 15) {
+
+	    last_monitor_time = time(NULL);
+
+	    if (srv_print_innodb_monitor) {
+	
+	        printf("=====================================\n");
+		ut_print_timestamp(stdout);
+	
+		printf(" INNODB MONITOR OUTPUT\n"
+	       	       "=====================================\n");
+		printf("----------\n"
+		       "SEMAPHORES\n"
+		       "----------\n");
+		sync_print();
+		printf("------------\n"
+		       "TRANSACTIONS\n"
+		       "------------\n");
+		lock_print_info();
+		printf("--------\n"
+		       "FILE I/O\n"
+		       "--------\n");
+		os_aio_print();
+		printf("-------------\n"
+		       "INSERT BUFFER\n"
+		       "-------------\n");
+		ibuf_print();
+		printf("---\n"
+		       "LOG\n"
+		       "---\n");
+		log_print();
+		printf("----------------------\n"
+		       "BUFFER POOL AND MEMORY\n"
+		       "----------------------\n");
+		printf(
+	"Total memory allocated %lu; in additional pool allocated %lu\n",
+				ut_total_allocated_memory,
+				mem_pool_get_reserved(mem_comm_pool));
+		buf_print_io();
+		printf("--------------\n"
+		       "ROW OPERATIONS\n"
+		       "--------------\n");
+		printf("InnoDB main thread state: %s\n",
+						srv_main_thread_op_info);
+		printf(
+	"Number of rows inserted %lu, updated %lu, deleted %lu, read %lu\n",
+			srv_n_rows_inserted, 
+			srv_n_rows_updated, 
+			srv_n_rows_deleted, 
+			srv_n_rows_read);
+		printf(
+	"%.2f inserts/s, %.2f updates/s, %.2f deletes/s, %.2f reads/s\n",
+			(srv_n_rows_inserted - srv_n_rows_inserted_old)
+						/ time_elapsed,
+			(srv_n_rows_updated - srv_n_rows_updated_old)
+						/ time_elapsed,
+			(srv_n_rows_deleted - srv_n_rows_deleted_old)
+						/ time_elapsed,
+			(srv_n_rows_read - srv_n_rows_read_old)
+						/ time_elapsed);
+
+		srv_n_rows_inserted_old = srv_n_rows_inserted;
+		srv_n_rows_updated_old = srv_n_rows_updated;
+		srv_n_rows_deleted_old = srv_n_rows_deleted;
+		srv_n_rows_read_old = srv_n_rows_read;
+
+		printf("----------------------------\n"
+		       "END OF INNODB MONITOR OUTPUT\n"
+		       "============================\n");
+
+		
+            }
+
+            if (srv_print_innodb_tablespace_monitor) {
+	
+		printf("================================================\n");
+
+		ut_print_timestamp(stdout);
+
+		printf(" INNODB TABLESPACE MONITOR OUTPUT\n"
+		       "================================================\n");
+	       
+		fsp_print(0);
+		fprintf(stderr, "Validating tablespace\n");
+		fsp_validate(0);
+		fprintf(stderr, "Validation ok\n");
+		printf("---------------------------------------\n"
+	       		"END OF INNODB TABLESPACE MONITOR OUTPUT\n"
+	       		"=======================================\n");
+	    }
+
+	    if (srv_print_innodb_table_monitor) {
+
+		printf("===========================================\n");
+
+		ut_print_timestamp(stdout);
+
+		printf(" INNODB TABLE MONITOR OUTPUT\n"
+		       "===========================================\n");
+	    	dict_print();
+
+		printf("-----------------------------------\n"
+	       		"END OF INNODB TABLE MONITOR OUTPUT\n"
+	       		"==================================\n");
+	    }
+	}
+
 	mutex_enter(&kernel_mutex);
 
 	some_waits = FALSE;
@@ -1786,11 +1930,10 @@ loop:
 
 				/* Timeout exceeded or a wrap over in system
 				time counter: cancel the lock request queued
-				by the transaction; NOTE that currently only
-				a record lock request can be waiting in
-				MySQL! */
+				by the transaction and release possible
+				other transactions waiting behind */
 
-				lock_rec_cancel(
+				lock_cancel_waiting_and_release(
 				    thr_get_trx(slot->thr)->wait_lock);
 			}
 		}
@@ -1800,11 +1943,15 @@ loop:
 
 	mutex_exit(&kernel_mutex);
 
-	if (some_waits) {
+	if (some_waits || srv_print_innodb_monitor
+			|| srv_print_innodb_lock_monitor
+			|| srv_print_innodb_tablespace_monitor
+			|| srv_print_innodb_table_monitor) {
 		goto loop;
 	}
 
-	/* No one was waiting for a lock: suspend this thread */
+	/* No one was waiting for a lock and no monitor was active:
+	suspend this thread */
 	
 	os_event_wait(srv_lock_timeout_thread_event);
 
@@ -1817,6 +1964,36 @@ loop:
 #endif
 }
 
+/*************************************************************************
+A thread which prints warnings about semaphore waits which have lasted
+too long. These can be used to track bugs which cause hangs. */
+
+#ifndef __WIN__
+void*
+#else
+ulint
+#endif
+srv_error_monitor_thread(
+/*=====================*/
+			/* out: a dummy parameter */
+	void*	arg)	/* in: a dummy parameter required by
+			os_thread_create */
+{
+	UT_NOT_USED(arg);
+loop:
+	os_thread_sleep(10000000);
+
+	sync_array_print_long_waits();
+			
+	goto loop;
+
+#ifndef __WIN__
+        return(NULL);
+#else
+	return(0);
+#endif
+}
+
 /***********************************************************************
 Tells the InnoDB server that there has been activity in the database
 and wakes up the master thread if it is suspended (not sleeping). Used
@@ -1855,15 +2032,18 @@ srv_master_thread(
 			os_thread_create */
 {
 	os_event_t	event;
+	time_t          last_flush_time;
+	time_t          current_time;
 	ulint		old_activity_count;
 	ulint		n_pages_purged;
 	ulint		n_bytes_merged;
 	ulint		n_pages_flushed;
 	ulint		n_bytes_archived;
+	ulint		n_ios;
+	ulint		n_ios_old;
+	ulint		n_ios_very_old;
+	ulint		n_pend_ios;
 	ulint		i;
-	time_t          last_flush_time;
-	time_t          current_time;
-	time_t          last_monitor_time;
 	
 	UT_NOT_USED(arg);
 
@@ -1876,26 +2056,56 @@ srv_master_thread(
 	mutex_exit(&kernel_mutex);
 
 	os_event_set(srv_sys->operational);
-
-	last_monitor_time = time(NULL);
 loop:
+	srv_main_thread_op_info = "reserving kernel mutex";
+
+	n_ios_very_old = log_sys->n_log_ios + buf_pool->n_pages_read
+						+ buf_pool->n_pages_written;
 	mutex_enter(&kernel_mutex);
 
 	old_activity_count = srv_activity_count;
 
 	mutex_exit(&kernel_mutex);
 
-	/* We run purge every 10 seconds, even if the server were active: */
+	/* We run purge and a batch of ibuf_contract every 10 seconds, even
+	if the server were active: */
 
 	for (i = 0; i < 10; i++) {
+		n_ios_old = log_sys->n_log_ios + buf_pool->n_pages_read
+						+ buf_pool->n_pages_written;
+
+		srv_main_thread_op_info = "sleeping";
 		os_thread_sleep(1000000);
 
+		if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) {
+
+			goto loop;
+		}
+
 		/* We flush the log once in a second even if no commit
 		is issued or the we have specified in my.cnf no flush
 		at transaction commit */
 
+		srv_main_thread_op_info = "flushing log";
 		log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
 
+		/* If there were less than 10 i/os during the
+		one second sleep, we assume that there is free
+		disk i/o capacity available, and it makes sense to
+		do an insert buffer merge. */
+
+		n_pend_ios = buf_get_n_pending_ios()
+						+ log_sys->n_pending_writes;
+		n_ios = log_sys->n_log_ios + buf_pool->n_pages_read
+						+ buf_pool->n_pages_written;
+		if (n_pend_ios < 3 && (n_ios - n_ios_old < 10)) {
+			srv_main_thread_op_info = "doing insert buffer merge";
+			ibuf_contract_for_n_pages(TRUE, 5);
+
+			srv_main_thread_op_info = "flushing log";
+			log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
+		}
+		
 		if (srv_activity_count == old_activity_count) {
 
 			if (srv_print_thread_releases) {
@@ -1910,28 +2120,48 @@ loop:
 		printf("Master thread wakes up!\n");
 	}
 
+	/* If there were less than 200 i/os during the 10 second period,
+	we assume that there is free disk i/o capacity available, and it
+	makes sense to do a buffer pool flush. */
+
+	n_pend_ios = buf_get_n_pending_ios() + log_sys->n_pending_writes;
+	n_ios = log_sys->n_log_ios + buf_pool->n_pages_read
+						+ buf_pool->n_pages_written;
+	if (n_pend_ios < 3 && (n_ios - n_ios_very_old < 200)) {
+
+		srv_main_thread_op_info = "flushing buffer pool pages";
+		buf_flush_batch(BUF_FLUSH_LIST, 50, ut_dulint_max);
+
+		srv_main_thread_op_info = "flushing log";
+		log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
+	}
+
+	/* We run a batch of insert buffer merge every 10 seconds,
+	even if the server were active */
+
+	srv_main_thread_op_info = "doing insert buffer merge";
+	ibuf_contract_for_n_pages(TRUE, 5);
+
+	srv_main_thread_op_info = "flushing log";
+	log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
+
+	/* We run a full purge every 10 seconds, even if the server
+	were active */
+	
 	n_pages_purged = 1;
 
 	last_flush_time = time(NULL);
 
 	while (n_pages_purged) {
-		/* TODO: replace this by a check if we are running
-							out of file space! */
-		if (srv_print_innodb_monitor) {
-			ut_print_timestamp(stdout);
-			printf(" InnoDB starts purge\n");
-		}
-		
-		n_pages_purged = trx_purge();
 
-		if (srv_print_innodb_monitor) {
-			ut_print_timestamp(stdout);
-			printf(" InnoDB purged %lu pages\n", n_pages_purged);
-		}
+		srv_main_thread_op_info = "purging";
+		n_pages_purged = trx_purge();
 
 		current_time = time(NULL);
 
 		if (difftime(current_time, last_flush_time) > 1) {
+			srv_main_thread_op_info = "flushing log";
+
 		        log_flush_up_to(ut_dulint_max, LOG_WAIT_ONE_GROUP);
 			last_flush_time = current_time;
 		}
@@ -1941,67 +2171,7 @@ background_loop:
 	/* In this loop we run background operations when the server
 	is quiet */
 
-	current_time = time(NULL);
-	
-	if (difftime(current_time, last_monitor_time) > 15) {
-
-	    last_monitor_time = time(NULL);
-
-	    if (srv_print_innodb_monitor) {
-	
-	        printf("=====================================\n");
-		ut_print_timestamp(stdout);
-	
-		printf(" INNODB MONITOR OUTPUT\n"
-	       	       "=====================================\n");
-		printf("------------\n"
-		       "TRANSACTIONS\n"
-		       "------------\n");
-		lock_print_info();
-		printf("-----------------------------------------------\n"
-		       "CURRENT SEMAPHORES RESERVED AND SEMAPHORE WAITS\n"
-		       "-----------------------------------------------\n");
-		sync_print();
-		printf("CURRENT PENDING FILE I/O'S\n"
-		       "--------------------------\n");
-		os_aio_print();
-		printf("-----------\n"
-		       "BUFFER POOL\n"
-		       "-----------\n");
-		buf_print_io();
-		printf("--------------\n"
-		       "ROW OPERATIONS\n"
-		       "--------------\n");
-		printf(
-	"Number of rows inserted %lu, updated %lu, deleted %lu, read %lu\n",
-			srv_n_rows_inserted, 
-			srv_n_rows_updated, 
-			srv_n_rows_deleted, 
-			srv_n_rows_read);
-		printf("Server activity counter %lu\n", srv_activity_count);
-		printf("----------------------------\n"
-		       "END OF INNODB MONITOR OUTPUT\n"
-		       "============================\n");
-            }
-
-            if (srv_print_innodb_tablespace_monitor) {
-	
-		printf("================================================\n");
-
-		ut_print_timestamp(stdout);
-
-		printf(" INNODB TABLESPACE MONITOR OUTPUT\n"
-		       "================================================\n");
-	       
-		fsp_print(0);
-		fprintf(stderr, "Validating tablespace\n");
-		fsp_validate(0);
-		fprintf(stderr, "Validation ok\n");
-		printf("---------------------------------------\n"
-	       		"END OF INNODB TABLESPACE MONITOR OUTPUT\n"
-	       		"=======================================\n");
-	    }
-	}
+	srv_main_thread_op_info = "reserving kernel mutex";
 
 	mutex_enter(&kernel_mutex);
 	if (srv_activity_count != old_activity_count) {
@@ -2014,17 +2184,11 @@ background_loop:
 	/* The server has been quiet for a while: start running background
 	operations */
 		
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB starts purge\n");
-	}
+	srv_main_thread_op_info = "purging";
 
 	n_pages_purged = trx_purge();
 
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB purged %lu pages\n", n_pages_purged);
-	}
+	srv_main_thread_op_info = "reserving kernel mutex";
 
 	mutex_enter(&kernel_mutex);
 	if (srv_activity_count != old_activity_count) {
@@ -2033,17 +2197,10 @@ background_loop:
 	}
 	mutex_exit(&kernel_mutex);
 
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB starts insert buffer merge\n");
-	}
+	srv_main_thread_op_info = "doing insert buffer merge";
+	n_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20);
 
-	n_bytes_merged = ibuf_contract(TRUE);
-
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB merged %lu bytes\n", n_bytes_merged);
-	}
+	srv_main_thread_op_info = "reserving kernel mutex";
 
 	mutex_enter(&kernel_mutex);
 	if (srv_activity_count != old_activity_count) {
@@ -2052,17 +2209,10 @@ background_loop:
 	}
 	mutex_exit(&kernel_mutex);
 	
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB (main thread) starts buffer pool flush\n");
-	}
-
+	srv_main_thread_op_info = "flushing buffer pool pages";
 	n_pages_flushed = buf_flush_batch(BUF_FLUSH_LIST, 100, ut_dulint_max);
 
-	if (srv_print_innodb_monitor) {
-		ut_print_timestamp(stdout);
-		printf(" InnoDB flushed %lu pages\n", n_pages_flushed);
-	}
+	srv_main_thread_op_info = "reserving kernel mutex";
 
 	mutex_enter(&kernel_mutex);
 	if (srv_activity_count != old_activity_count) {
@@ -2071,16 +2221,23 @@ background_loop:
 	}
 	mutex_exit(&kernel_mutex);
 	
+	srv_main_thread_op_info = "waiting for buffer pool flush to end";
 	buf_flush_wait_batch_end(BUF_FLUSH_LIST);
 
+	srv_main_thread_op_info = "making checkpoint";
+
 	log_checkpoint(TRUE, FALSE);
 
+	srv_main_thread_op_info = "reserving kernel mutex";
+
 	mutex_enter(&kernel_mutex);
 	if (srv_activity_count != old_activity_count) {
 		mutex_exit(&kernel_mutex);
 		goto loop;
 	}
 	mutex_exit(&kernel_mutex);
+
+	srv_main_thread_op_info = "archiving log (if log archive is on)";
 	
 	log_archive_do(FALSE, &n_bytes_archived);
 
@@ -2098,12 +2255,16 @@ background_loop:
 	/* There is no work for background operations either: suspend
 	master thread to wait for more server activity */
 	
+	srv_main_thread_op_info = "suspending";
+
 	mutex_enter(&kernel_mutex);
 
 	event = srv_suspend_thread();
 
 	mutex_exit(&kernel_mutex);
 
+	srv_main_thread_op_info = "waiting for server activity";
+
 	os_event_wait(event);
 
 	goto loop;
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
index 15d99ab3001..b9e7050d546 100644
--- a/innobase/srv/srv0start.c
+++ b/innobase/srv/srv0start.c
@@ -73,7 +73,10 @@ os_thread_id_t	thread_ids[SRV_MAX_N_IO_THREADS + 5];
 #define SRV_N_PENDING_IOS_PER_THREAD 	OS_AIO_N_PENDING_IOS_PER_THREAD
 #define SRV_MAX_N_PENDING_SYNC_IOS	100
 
-#define SRV_MAX_N_OPEN_FILES		25
+/* The following limit may be too big in some old operating systems:
+we may get an assertion failure in os0file.c */
+
+#define SRV_MAX_N_OPEN_FILES		500
 
 #define SRV_LOG_SPACE_FIRST_ID		1000000000
 
@@ -315,7 +318,12 @@ open_or_create_data_files(
 	ulint	size_high;
 	char	name[10000];
 
-	ut_a(srv_n_data_files < 1000);
+	if (srv_n_data_files >= 1000) {
+		fprintf(stderr, "InnoDB: can only have < 1000 data files\n"
+				"InnoDB: you have defined %lu\n",
+				srv_n_data_files);
+		return(DB_ERROR);
+	}
 
 	*sum_of_new_sizes = 0;
 	
@@ -336,6 +344,8 @@ open_or_create_data_files(
 			/* The partition is opened, not created; then it is
 			written over */
 
+			srv_created_new_raw = TRUE;
+
 			files[i] = os_file_create(
 				name, OS_FILE_OPEN, OS_FILE_NORMAL,
 						OS_DATA_FILE, &ret);
@@ -375,6 +385,7 @@ open_or_create_data_files(
 			if (!ret) {
 				fprintf(stderr,
 				"InnoDB: Error in opening %s\n", name);
+				os_file_get_last_error();
 
 				return(DB_ERROR);
 			}
@@ -537,9 +548,6 @@ innobase_start_or_create_for_mysql(void)
 /*====================================*/
 				/* out: DB_SUCCESS or error code */
 {
-	ulint	i;
-	ulint	k;
-	ulint	err;
 	ibool	create_new_db;
 	ibool	log_file_created;
 	ibool	log_created	= FALSE;
@@ -550,6 +558,9 @@ innobase_start_or_create_for_mysql(void)
 	ulint	max_arch_log_no;
 	ibool	start_archive;
 	ulint   sum_of_new_sizes;
+	ulint	err;
+	ulint	i;
+	ulint	k;
 	mtr_t   mtr;
 
 	log_do_write = TRUE;
@@ -866,17 +877,19 @@ innobase_start_or_create_for_mysql(void)
                              	     SRV_MAX_N_IO_THREADS); */
 	}
 
-	/* Create the master thread which monitors the database
-	server, and does purge and other utility operations */
-
-	os_thread_create(&srv_master_thread, NULL, thread_ids + 1 +
-							SRV_MAX_N_IO_THREADS);
 	/* fprintf(stderr, "Max allowed record size %lu\n",
 				page_get_free_space_of_empty() / 2); */
 
-	/* Create the thread which watches the timeouts for lock waits */
-	os_thread_create(&srv_lock_timeout_monitor_thread, NULL,
+	/* Create the thread which watches the timeouts for lock waits
+	and prints InnoDB monitor info */
+	
+	os_thread_create(&srv_lock_timeout_and_monitor_thread, NULL,
 					thread_ids + 2 + SRV_MAX_N_IO_THREADS);	
+
+	/* Create the thread which warns of long semaphore waits */
+	os_thread_create(&srv_error_monitor_thread, NULL,
+					thread_ids + 3 + SRV_MAX_N_IO_THREADS);	
+
 	srv_was_started = TRUE;
 	srv_is_being_started = FALSE;
 
@@ -886,6 +899,17 @@ innobase_start_or_create_for_mysql(void)
 		trx_sys_create_doublewrite_buf();
 	}
 
+	err = dict_create_or_check_foreign_constraint_tables();
+
+	if (err != DB_SUCCESS) {
+		return((int)DB_ERROR);
+	}
+
+	/* Create the master thread which monitors the database
+	server, and does purge and other utility operations */
+
+	os_thread_create(&srv_master_thread, NULL, thread_ids + 1 +
+							SRV_MAX_N_IO_THREADS);
 	/* buf_debug_prints = TRUE; */
 	
 	ut_print_timestamp(stderr);
@@ -903,12 +927,16 @@ innobase_shutdown_for_mysql(void)
 				/* out: DB_SUCCESS or error code */
 {
         if (!srv_was_started) {
-	  if (srv_is_being_started) {
-	    ut_print_timestamp(stderr);
-            fprintf(stderr, 
-	"  InnoDB: Warning: shutting down a not properly started database\n");
-	  }
-	  return(DB_SUCCESS);
+	  	if (srv_is_being_started) {
+	    		ut_print_timestamp(stderr);
+            		fprintf(stderr, 
+	"  InnoDB: Warning: shutting down a not properly started\n");
+	    		ut_print_timestamp(stderr);
+            		fprintf(stderr, 
+	"  InnoDB: or created database!\n");
+	  	}
+
+	  	return(DB_SUCCESS);
 	}
 
 	/* Flush buffer pool to disk, write the current lsn to
@@ -917,6 +945,6 @@ innobase_shutdown_for_mysql(void)
 	logs_empty_and_mark_files_at_shutdown();
 
 	ut_free_all_mem();
-
+	
 	return((int) DB_SUCCESS);
 }