into mysql.com:/home/pz/mysql/mysql-4.1

no ulong type, one should use unsigned long instead

Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22

as expected and returned default charset instead:
SET @x = _koi8_ru'test';
SELECT CHARSET(@x);

SELECT * FROM t WHERE (c COLLATE latin1) >'a'
might fail in some cases

Some optimization to reduce rules number in sql_yacc.yy

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.orig

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.constraint

0 was dispayed before, this looked confusing.

Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

I know I should have waited for Monty's merge ...

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

B-Tree explanation fix (from Peter Zaitsev).

into teton.kitebird.com:/home/paul/mysql-4.0

SELECT k FROM t1 GROUP BY k COLLATE latin1 ORDER BY k COLLATE latin1_de

Fixed hangup problem in net_clear() on HPUX and Windows. 

that will take place properly after pull from 4.0, in order to 
handle conversions from quoted constants to bigint's.

  Fix a spurious deadlock introduced in the previous fix when next-key locks are requested for a page supremum record

Fixed hang in start_slave_threads() when thread dies quickly.