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


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

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

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

i.e. ndb_restore

my_strnxfrm_utf8 now requires 2 bytes per character
in filesort key, instead of 3 bytes per character.
Shorter filesort keys make sorting faster.

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

mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge bug#8101 and setBound usage if id instead of name

sql/sql_help.cc:
  a fix (bug #8129: help.test fails using --ps-protocol)
  In case of 'range' we have to call quick->reset().

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

Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work

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

mysql-test/r/ndb_index_unique.result:
  Fix result file for unique test

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

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

mysql-test/t/ndb_index_unique.test:
  Drop table t8 in beginning of test as it's used

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


innobase/include/univ.i:
  Auto merged
sql/item_create.cc:
  Auto merged

    remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix

libmysqld/examples/Makefile.am:
  Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'

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

  Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.


innobase/include/rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
innobase/include/rem0rec.h:
  Corrected formatting of comments.

BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

into mysql.com:/my/mysql-4.1

BitKeeper/etc/ignore:
  added libmysqld/examples/mysqltest_embedded
client/mysqlbinlog.cc:
  Call mysql_close() before die()
innobase/include/eval0eval.ic:
  Remove assert that fails on 64 bit machines
  (Tested with BUILD/compile-pentium64-valgrind-max on 64 bit Intel CPU)
sql/mysqld.cc:
  Force lower_case_table_names to 0 if set to 2 on case insensitive file name
sql/sql_select.cc:
  Remove #if 0

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

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

into mysql.com:/my/mysql-4.1

mysql-test/mysql-test-run.sh:
  Less restricted permissions.
mysql-test/r/rpl_rotate_logs.result:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.
mysql-test/t/rpl_rotate_logs.test:
  If the path where mysql-test-run was run was symlinked, this test could
  fail. This is a fix.

client/mysql.cc:
  Fixed Bug#981  ".mysql_history is lost if mysql clinent exit when out of space"
client/mysqlbinlog.cc:
  Fix for mysqlbinlog, mysql_close() needs to be called.
libmysql/Makefile.shared:
  Added use of my_rename()
mysql-test/mysql-test-run.sh:
  Added possibility to add file t/testname.disabled. This will disable a
  test with same base name. Additionally, if the .disabled file contains text,
  it will be appended as a comment after the test during run.

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

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