into hundin.mysql.fi:/home/heikki/mysql-5.0

  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE

  Remove superfluous fprintf about log record application in InnoDB startup

  Add a missing newline to an error print

  Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
os0thread.c:
  test

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

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

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

into mysql.com:/home/timka/mysql/src/5.0-dbg

corrected possible unalignment in NdbRecAttr access methods

into mysql.com:/home/timka/mysql/src/4.1-virgin

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

into hundin.mysql.fi:/home/heikki/mysql-5.0

  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works

  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition

Needs additional manual merge.

into mysql.com:/home/timka/mysql/src/4.1-dbg

into hundin.mysql.fi:/home/heikki/mysql-4.1

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

  #7943: Wrong prefix lengths reported on UTF-8 columns
  after merge fix.

SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.

- use incremental linker

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

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

into mysql.com:/home/jonas/src/mysql-5.0

fix as not to overwrite previoulsy set flags in configure

into mysql.com:/home/jonas/src/mysql-5.0

  Make sure to ship error code in system error signal

No commit message

  read row size with wrong type

  removed this since it easily gives errors if previous tests fail

into mysql.com:/home/jonas/src/mysql-5.0

  compile error

  skip ndbcluster start failure if --force given

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-wl2126-fix