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

into mysql.com:/home/my/mysql-4.0

Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)

into mishka.local:/home/my/mysql-4.1

Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  test

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  Add note to mysql_hex_string() comment.

  InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested

into hundin.mysql.fi:/home/marko/j/mysql-4.1

  minor fixes

  Check DERIVATION_NONE only for UNIONS.

contributed by Takeshi. I also added HEX support for 
"extended-inserts".

  New function mysql_hex_string()

  Replace a tolower() loop with innobase_casedn_str()

into mysql.com:/space/pekka/ndb/version/my41-tux

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

  If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  new file

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

+ some fixed string length cleanup
+ fixed a better error printout

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6057

  Remove unnesessary code: use_mb is always TRUE for the multibyte charsets.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge