put back the things that the merge removed

limited support on Alpha - in general case, even with frame pointer,
stack trace on alpha is impossible without looking at the symbol table
frame pointer does get saved on the stack, but you have no idea where
and where the return address is saved. So the best we can do without
the symbol table is look for magic opcodes and try to guess how big 
each frame is and where the return address was hidden from the 
instruction parameters. In practice, we can usually go up 3-4 frames 
before we hit some nasty frame that the current code cannot figure
out. This is actually not too bad, especially when we already have the query

Also cleaned up messages, print more variables, tell the user of
how much memory mysqld could potentially use, and warn of
what can happen with default STACK_SIZE and a lot of connections if
coredump happens when there are more than 200 connections. 

into donna.mysql.fi:/home/heikki/mysqle

Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB

    removed porn site

    added reference to htCheck, and removed some broken links (incidentally, found by htCheck)

    fixed bug
sql/sql_repl.cc
    undid virtual master change

into mysql.sashanet.com:/home/sasha/src/bk/mysql

row0uins.c	Partial fix to concurrent drop table and rollback by other user of rows in that table

sql_yacc.yy	changed ...IN SHARE MODE to ...LOCK IN SHARE MODE to resolve a parsing bug after a WHERE clause

os0file.c	Removed unnecessary code from os_file_read

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql

buf0buf.h	Add checksum to written pages to check that they are also read in unchanged
buf0flu.c	Add checksum to written pages to check that they are also read in unchanged
buf0buf.c	Add checksum to written pages to check that they are also read in unchanged

row0uins.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
row0umod.c	Partial fix to the DROP TABLE + another user rolls back in that table problem
os0file.c	Reduce probability of deadlock bugs in connection with ibuf: do not let the ibuf i/o handler sleep

os0file.c	Always do fsync after a file write to reduce possibility of a partially written page in an OS crash
buf0rea.c	Fixed a recovery hang associated with ibuf bitmap pages