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

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

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

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.

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-ndb-new

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.

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

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

- use incremental linker

  fixed node id printout bug

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

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

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