merge with 4.0 to get security fixes and latest bug fixes

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/srv0start.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
libmysql/manager.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Removed wrong define USE_SYMLINK
include/config-win.h:
  Use original code
innobase/srv/srv0srv.c:
  merge
innobase/usr/usr0sess.c:
  merge
libmysql/libmysql.c:
  merge
mysql-test/r/func_test.result:
  merge
mysql-test/t/func_test.test:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge

2 files changed, 0 insertions, 170 deletions

diff --git a/innobase/mach/ts/makefile b/innobase/mach/ts/makefile
deleted file mode 100644
index e9531e6ebe0..00000000000
--- a/innobase/mach/ts/makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ..\..\makefile.i
-
-tsmach: ..\mach.lib tsmach.c
-	$(CCOM) $(CFL) -I.. -I..\.. ..\mach.lib ..\..\ut.lib ..\..\os.lib tsmach.c $(LFL)
-
-
-
-
-
-
-
diff --git a/innobase/mach/ts/tsmach.c b/innobase/mach/ts/tsmach.c
deleted file mode 100644
index a4b67227d20..00000000000
--- a/innobase/mach/ts/tsmach.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/************************************************************************
-The test module for the machine-dependent utilities
-
-(c) 1995 Innobase Oy
-
-Created 11/28/1995 Heikki Tuuri
-*************************************************************************/
-
-#include "../mach0data.h"
-
-byte	arr[4000000];
-
-
-/*********************************************************************
-Test for ulint write and read. */
-
-void
-test1(void)
-/*=======*/
-{
-	ulint	a, i, j;
-	ulint	tm, oldtm;
-	
-	printf("-------------------------------------------\n");
-	printf("TEST 1. Speed test of ulint read and write \n");
-
-	a = 0;
-	
-	oldtm = ut_clock();
-
-	for (j = 0; j < 100; j++) {
-	for (i = 0; i < 10000; i++) {
-
-		a += mach_read_from_4(arr + i * 4);
-	}
-	} 
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			j * i, tm - oldtm);
-
-	oldtm = ut_clock();
-
-	for (j = 0; j < 100; j++) {
-	for (i = 0; i < 10000; i++) {
-
-		a += mach_read(arr + i * 4);
-	}
-	} 
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			j * i, tm - oldtm);
-	
-	oldtm = ut_clock();
-
-	for (j = 0; j < 100; j++) {
-	for (i = 0; i < 10000; i++) {
-
-		a += mach_read_from_4(arr + i * 4 + 1);
-	}
-	} 
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			j * i, tm - oldtm);
-	oldtm = ut_clock();
-
-	for (j = 0; j < 100; j++) {
-	for (i = 0; i < 10000; i++) {
-
-		a += mach_read(arr + i * 4 + 1);
-	}
-	} 
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			j * i, tm - oldtm);
-	
-	oldtm = ut_clock();
-
-	for (i = 0; i < 1000000; i++) {
-
-		a += mach_read_from_4(arr + i * 4);
-	}
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			i, tm - oldtm);
-	oldtm = ut_clock();
-
-	for (i = 0; i < 1000000; i++) {
-
-		a += mach_read(arr + i * 4);
-	}
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu ulints %lu millisecs\n",
-			i, tm - oldtm);
-	
-	oldtm = ut_clock();
-
-	for (j = 0; j < 100; j++) {
-	for (i = 0; i < 10000; i++) {
-
-		a += mach_read_from_2(arr + i * 2);
-	}
-	} 
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for read of %lu 16-bit ints %lu millisecs\n",
-			j * i, tm - oldtm);
-}
-
-/*********************************************************************
-Test for ulint write and read. */
-
-void
-test2(void)
-/*=======*/
-{
-	ulint	a[2];
-	
-	printf("-------------------------------------------\n");
-	printf("TEST 2. Correctness test of ulint read and write \n");
-
-	mach_write_to_4((byte*)&a, 737237727);
-	
-	ut_a(737237727 == mach_read_from_4((byte*)&a));
-	
-	mach_write_to_2((byte*)&a, 7372);
-	
-	ut_a(7372 == mach_read_from_2((byte*)&a));
-	
-	mach_write_to_1((byte*)&a, 27);
-	
-	ut_a(27 == mach_read_from_1((byte*)&a));
-	
-	mach_write((byte*)&a, 737237727);
-	
-	ut_a(737237727 == mach_read((byte*)&a));
-}	
-
-void 
-main(void) 
-{
-	test1();
-	test2();
-
-	printf("TEST SUCCESSFULLY COMPLETED!\n");
-}