Merge with 4.0.11

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge

9 files changed, 120 insertions, 21 deletions

diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index 2416149c3a8..69952c842ce 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -607,11 +607,11 @@ btr_cur_open_at_index_side(
 			page_cur_set_after_last(page, page_cursor);
 		}
 
-		if (estimate) {
-			btr_cur_add_path_info(cursor, height, root_height);
-		}
-
 		if (height == 0) {
+		        if (estimate) {
+			        btr_cur_add_path_info(cursor, height,
+						      root_height);
+		        }
 
 			break;
 		}
@@ -624,6 +624,10 @@ btr_cur_open_at_index_side(
 			page_cur_move_to_prev(page_cursor);
 		}
 
+		if (estimate) {
+			btr_cur_add_path_info(cursor, height, root_height);
+		}
+
 		height--;
 
 		node_ptr = page_cur_get_rec(page_cursor);
diff --git a/innobase/configure.in b/innobase/configure.in
index 59d213fef12..29309a2c0a5 100644
--- a/innobase/configure.in
+++ b/innobase/configure.in
@@ -110,14 +110,14 @@ case "$target" in
 	 CFLAGS="$CFLAGS -DUNIV_INTEL_X86";;
 esac
 
-AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile
-		buf/Makefile com/Makefile data/Makefile
-		dict/Makefile dyn/Makefile
-		eval/Makefile fil/Makefile fsp/Makefile fut/Makefile
-		ha/Makefile ibuf/Makefile include/Makefile
-		lock/Makefile log/Makefile
-		mach/Makefile mem/Makefile mtr/Makefile odbc/Makefile
-		page/Makefile pars/Makefile que/Makefile
-		read/Makefile rem/Makefile row/Makefile
-		srv/Makefile sync/Makefile thr/Makefile trx/Makefile
+AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
+		buf/Makefile com/Makefile data/Makefile dnl
+		dict/Makefile dyn/Makefile dnl
+		eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
+		ha/Makefile ibuf/Makefile include/Makefile dnl
+		lock/Makefile log/Makefile dnl
+		mach/Makefile mem/Makefile mtr/Makefile odbc/Makefile dnl
+		page/Makefile pars/Makefile que/Makefile dnl
+		read/Makefile rem/Makefile row/Makefile dnl
+		srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl
 		usr/Makefile)
diff --git a/innobase/include/os0thread.h b/innobase/include/os0thread.h
index efc8651e06d..629cfef23a8 100644
--- a/innobase/include/os0thread.h
+++ b/innobase/include/os0thread.h
@@ -15,9 +15,10 @@ Created 9/8/1995 Heikki Tuuri
 /* Maximum number of threads which can be created in the program;
 this is also the size of the wait slot array for MySQL threads which
 can wait inside InnoDB */
-#ifdef __WIN__
+#if defined(__WIN__) || defined(__NETWARE__)
 /* Create less event semaphores because Win 98/ME had difficult creating
 40000 event semaphores */
+/* TODO: these just take a lot of memory on NetWare.  should netware move up? */
 #define	OS_THREAD_MAX_N		1000
 #else
 #define	OS_THREAD_MAX_N		10000
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c
index 9eae358c7fb..82ed957b5fb 100644
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -8,6 +8,7 @@ Created 10/21/1995 Heikki Tuuri
 
 #include "os0file.h"
 #include "os0sync.h"
+#include "os0thread.h"
 #include "ut0mem.h"
 #include "srv0srv.h"
 #include "fil0fil.h"
@@ -1093,6 +1094,7 @@ os_file_write(
 	DWORD		low;
 	DWORD		high;
 	ulint		i;
+	ulint		n_retries	= 0;
 
 	ut_a((offset & 0xFFFFFFFF) == offset);
 
@@ -1101,7 +1103,7 @@ os_file_write(
 	ut_ad(file);
 	ut_ad(buf);
 	ut_ad(n > 0);
-
+retry:
 	low = offset;
 	high = offset_high;
 	
@@ -1145,6 +1147,19 @@ os_file_write(
 		return(TRUE);
 	}
 
+	/* If some background file system backup tool is running, then, at
+	least in Windows 2000, we may get here a specific error. Let us
+	retry the operation 100 times, with 1 second waits. */
+	
+	if (GetLastError() == ERROR_LOCK_VIOLATION && n_retries < 100) {
+
+		os_thread_sleep(1000000);
+	
+		n_retries++;
+
+		goto retry;
+	}	
+	
 	if (!os_has_said_disk_full) {
 	
 		ut_print_timestamp(stderr);
@@ -1157,7 +1172,7 @@ os_file_write(
 "InnoDB: what the error number means.\n"
 "InnoDB: Check that your OS and file system support files of this size.\n"
 "InnoDB: Check also that the disk is not full or a disk quota exceeded.\n",
-			name, offset_high, offset, n, len,
+			name, offset_high, offset, n, (ulint)len,
 			(ulint)GetLastError());
 
 		os_has_said_disk_full = TRUE;
@@ -1180,13 +1195,13 @@ os_file_write(
 
 		fprintf(stderr,
 "  InnoDB: Error: Write to file %s failed at offset %lu %lu.\n"
-"InnoDB: %lu bytes should have been written, only %lu were written.\n"
+"InnoDB: %lu bytes should have been written, only %ld were written.\n"
 "InnoDB: Operating system error number %lu.\n"
 "InnoDB: Look from section 13.2 at http://www.innodb.com/ibman.html\n"
 "InnoDB: what the error number means or use the perror program of MySQL.\n"
 "InnoDB: Check that your OS and file system support files of this size.\n"
 "InnoDB: Check also that the disk is not full or a disk quota exceeded.\n",
-			name, offset_high, offset, n, (ulint)ret,
+			name, offset_high, offset, n, (long int)ret,
 							(ulint)errno);
 		os_has_said_disk_full = TRUE;
 	}
diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c
index bac1f23a1af..a9127e6310a 100644
--- a/innobase/os/os0sync.c
+++ b/innobase/os/os0sync.c
@@ -495,6 +495,8 @@ os_fast_mutex_free(
 	ut_a(fast_mutex);
 
 	DeleteCriticalSection((LPCRITICAL_SECTION) fast_mutex);
+#elif defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+	pthread_mutex_destroy(fast_mutex);
 #else
 	UT_NOT_USED(fast_mutex);
 
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c
index 30404c4e66b..b0076921e43 100644
--- a/innobase/os/os0thread.c
+++ b/innobase/os/os0thread.c
@@ -214,6 +214,8 @@ os_thread_sleep(
 {
 #ifdef __WIN__
 	Sleep(tm / 1000);
+#elif defined(__NETWARE__)
+	delay(tm / 1000);
 #else
 	struct timeval	t;
 
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
index 2bdcbe29758..af11516e9f0 100644
--- a/innobase/srv/srv0srv.c
+++ b/innobase/srv/srv0srv.c
@@ -1712,8 +1712,63 @@ srv_general_init(void)
 	thr_local_init();
 }
 
+
+#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+/* NetWare requires some cleanup of mutexes */
+
+/*************************************************************************
+Deinitializes the synchronization primitives, memory system, and the thread
+local storage. */
+
+void
+srv_general_free(void)
+/*==================*/
+{
+  sync_close();
+}
+#endif /* __NETWARE__ */
+
+
 /*======================= InnoDB Server FIFO queue =======================*/
 
+#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+/* NetWare requires some cleanup of mutexes */
+
+/*************************************************************************
+Deinitializes the server. */
+
+void
+srv_free(void)
+/*==========*/
+{
+  srv_conc_slot_t* conc_slot;
+  srv_slot_t* slot;
+  ulint i;
+
+  for (i = 0; i < OS_THREAD_MAX_N; i++)
+  {
+    slot = srv_table_get_nth_slot(i);
+    os_event_free(slot->event);
+  }
+
+  /* TODO: free(srv_sys->threads); */
+
+  for (i = 0; i < OS_THREAD_MAX_N; i++)
+  {
+    slot = srv_mysql_table + i;
+    os_event_free(slot->event);
+  }
+
+  /* TODO: free(srv_mysql_table); */
+
+  for (i = 0; i < OS_THREAD_MAX_N; i++)
+  {
+    conc_slot = srv_conc_slots + i;
+    os_event_free(conc_slot->event);
+  }
+}
+#endif /* __NETWARE__ */
+
 /*************************************************************************
 Puts an OS thread to wait if there are too many concurrent threads
 (>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
index d855a6aece5..671ef4e5b22 100644
--- a/innobase/srv/srv0start.c
+++ b/innobase/srv/srv0start.c
@@ -1454,6 +1454,10 @@ innobase_start_or_create_for_mysql(void)
 
 	os_fast_mutex_unlock(&srv_os_test_mutex);
 
+#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+	os_fast_mutex_free(&srv_os_test_mutex);  /* all platforms? */
+#endif /* __NETWARE__ */
+
 	if (srv_print_verbose_log) {
 	  	ut_print_timestamp(stderr);
 	  	fprintf(stderr, "  InnoDB: Started\n");
@@ -1500,12 +1504,28 @@ innobase_shutdown_for_mysql(void)
 		srv_conc_n_threads);
 	}
 
+#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+	/*
+	  TODO: Fix this temporary solution
+	  We are having a race condition occure with io_handler_thread threads.
+	  When they yield in os_aio_simulated_handle during shutdown, this
+	  thread was able to free the memory early.
+	*/
+	os_thread_yield();
+
+	/* TODO: Where should this be called? */
+	srv_free();
+
+	/* TODO: Where should this be called? */
+	srv_general_free();
+#endif
 	/*
 	TODO: We should exit the i/o-handler and other utility threads
 	before freeing all memory. Now this can potentially cause a seg
 	fault!
 	*/
-#ifdef NOT_WORKING_YET
+#if defined(NOT_WORKING_YET) || defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
+        /* NetWare requires this free */
         ut_free_all_mem();
 #endif 
 
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index 376be2e723a..20d68ba5a9f 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -220,7 +220,7 @@ mutex_create_func(
 	char*		cfile_name,	/* in: file name where created */
 	ulint		cline)		/* in: file line where created */
 {
-#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) 
+#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) && !defined(__NETWARE)
 	mutex_reset_lock_word(mutex);
 #else	
 	os_fast_mutex_init(&(mutex->os_fast_mutex));