into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.

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

by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.

(Note: This affects only comments, not variable names.)

into mc05.(none):/space2/tomas/mm

  Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()

  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

XML and "collation customization" language parsers.

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

  local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility

into mysql.com:/home/jonas/src/mysql-4.1-ndb

Still don't know reason, but this works

into mc01.ndb.mysql.com:/space/mysql-4.1-ndb

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

Added new windows configuration

  Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'

some changes to make code nicer

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

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

Fixed bug introduced with upgrade code

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

  Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb