into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

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


mysql-test/mysql-test-run.sh:
  Auto merged

  backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0

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


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

ndb/test/ndbapi/flexAsynch.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexBench.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/flexHammer.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/ndbapi/slow_select.cpp:
  Add includes as memcpy is introduced in NdbRecAttr
ndb/test/src/HugoCalculator.cpp:
  Add includes as memcpy is introduced in NdbRecAttr

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


ndb/tools/waiter.cpp:
  Auto merged

mysql-test/r/select_found.result:
  Auto merged

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


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

  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.


sql/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.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.

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


innobase/fil/fil0fil.c:
  Auto merged

  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


innobase/fil/fil0fil.c:
  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()

  Remove superfluous fprintf about log record application in InnoDB startup


innobase/log/log0recv.c:
  Remove superfluous fprintf about log record application in InnoDB startup

  Add a missing newline to an error print


innobase/fil/fil0fil.c:
  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


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

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


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged

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


innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged

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


innobase/fil/fil0fil.c:
  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


innobase/dict/dict0dict.c:
  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition

sql/sql_show.cc:
  removed sql_key_cache

Needs additional manual merge.


mysys/mf_keycache.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Properly resetting all key cache counters.
sql/sql_show.cc:
  Needs manual merge.

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


sql/sql_show.cc:
  Auto merged

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.


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

mysql-test/r/ctype_mb.result:
  Auto merged
sql/sql_show.cc:
  merge

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


configure.in:
  Fix weird link error on sol9x86

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

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


sql/share/errmsg.txt:
  Auto merged

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

fix as not to overwrite previoulsy set flags in configure


config/ac-macros/ha_ndbcluster.m4:
  fix as not to overwrite previoulsy set flags in configure
configure.in:
  fix as not to overwrite previoulsy set flags in configure
mysql-test/mysql-test-run.sh:
  movet START_AND_EXIT check so it can actually be used