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, 132 deletions

diff --git a/innobase/ha/ts/makefile b/innobase/ha/ts/makefile
deleted file mode 100644
index aea21f11141..00000000000
--- a/innobase/ha/ts/makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ..\..\makefile.i
-
-tsha: ..\ha.lib tsha.c makefile
-	$(CCOM) $(CFL) -I.. -I..\.. ..\..\btr.lib ..\..\trx.lib ..\..\pars.lib ..\..\que.lib ..\..\lock.lib ..\..\row.lib ..\..\read.lib ..\..\srv.lib ..\..\com.lib ..\..\usr.lib ..\..\thr.lib ..\..\fut.lib ..\..\fsp.lib ..\..\page.lib ..\..\dyn.lib ..\..\mtr.lib ..\..\log.lib ..\..\rem.lib ..\..\fil.lib ..\..\buf.lib ..\..\dict.lib ..\..\data.lib ..\..\mach.lib ..\ha.lib ..\..\ut.lib ..\..\sync.lib ..\..\mem.lib ..\..\os.lib tsha.c $(LFL)
-
-
-
-
-
-
-
diff --git a/innobase/ha/ts/tsha.c b/innobase/ha/ts/tsha.c
deleted file mode 100644
index fd9a2e12f6e..00000000000
--- a/innobase/ha/ts/tsha.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/************************************************************************
-The test module for hash table
-
-(c) 1994, 1995 Innobase Oy
-
-Created 1/25/1994 Heikki Tuuri
-*************************************************************************/
-
-#include "ut0ut.h"
-#include "ha0ha.h"
-#include "mem0mem.h"
-#include "sync0sync.h"
-
-ulint	ulint_array[200000];
-
-void 
-test1(void)
-{
-	hash_table_t*	table1;
-	ulint		i;
-	ulint		n313			= 313;
-	ulint		n414			= 414;
-	
-	printf("------------------------------------------------\n");
-	printf("TEST 1. BASIC TEST\n");
-
-	table1 = ha_create(50000);
-	
-	ha_insert_for_fold(table1, 313, &n313);
-	
-	ha_insert_for_fold(table1, 313, &n414);
-
-	ut_a(ha_validate(table1));
-
-	ha_delete(table1, 313, &n313);
-	ha_delete(table1, 313, &n414);
-
-	ut_a(ha_validate(table1));
-
-	printf("------------------------------------------------\n");
-	printf("TEST 2. TEST OF MASSIVE INSERTS AND DELETES\n");
-
-	table1 = ha_create(10000);
-
-	for (i = 0; i < 200000; i++) {
-		ulint_array[i] = i;
-	}
-
-	for (i = 0; i < 50000; i++) {
-		ha_insert_for_fold(table1, i * 7, ulint_array + i);
-	}
-	
-	ut_a(ha_validate(table1));
-
-	for (i = 0; i < 50000; i++) {
-		ha_delete(table1, i * 7, ulint_array + i);
-	}
-
-	ut_a(ha_validate(table1));
-}
-
-void 
-test2(void)
-{
-	hash_table_t*	table1;
-	ulint		i;
-	ulint		oldtm, tm;
-	ha_node_t*	node;
-
-	printf("------------------------------------------------\n");
-	printf("TEST 3. SPEED TEST\n");
-
-	table1 = ha_create(300000);
-	
-	oldtm = ut_clock();
-	
-	for (i = 0; i < 200000; i++) {
-		ha_insert_for_fold(table1, i * 27877, ulint_array + i);
-	}
-
-	tm = ut_clock();
-
-	printf("Wall clock time for %lu inserts %lu millisecs\n",
-		i, tm - oldtm);
-	
-	oldtm = ut_clock();
-	
-	for (i = 0; i < 200000; i++) {
-		node = ha_search(table1, i * 27877);
-	}
-	
-	tm = ut_clock();
-
-	printf("Wall clock time for %lu searches %lu millisecs\n",
-		i, tm - oldtm);
-
-	oldtm = ut_clock();
-
-	for (i = 0; i < 200000; i++) {
-		ha_delete(table1, i * 27877, ulint_array + i);
-	}
-
-	tm = ut_clock();
-
-	printf("Wall clock time for %lu deletes %lu millisecs\n",
-		i, tm - oldtm);
-}
-
-void 
-main(void) 
-{
-	sync_init();
-	mem_init(1000000);
-
-	test1();
-
-	test2();
-
-	printf("TESTS COMPLETED SUCCESSFULLY!\n");
-}