support-files/mysql.server.sh:
  Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
  Note that the "stop" method is still wrong, as it does not wait for file removal.

Make test_if_skip_sort_order() rebuild tab->ref if it decides to use an index
different from the index join optimizer has choosen.  


mysql-test/r/group_by.result:
  Testcase for BUG#9213
mysql-test/t/group_by.test:
  Testcase for BUG#9213
sql/table.h:
  Added comments about TABLE::used_keys

into mysql.com:/usr/home/ram/work/mysql-4.1

sql/sql_select.cc:
  A fix (bug #9401: type_timestamp segfaults mysqld).
  1. create_tmp_field_from_field() is modified to take 'Item_ref *item' and 'char *name'
  instead of 'bool modify_item' and 'Item *item'.
  2. For Item_sum_min/max we should never modify item, so NULL is 
  passed as item to the create_tmp_field_from_field().

into mysql.com:/usr/home/bar/mysql-4.1

BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
  Delete: mysql-test/t/ctype_cp1251-master.opt

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

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Merge from 4.0

  Added option --with-big-tables


Build-tools/Do-compile:
  Added option --with-big-tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  Added option --with-blackhole


Build-tools/Do-compile:
  Added option --with-blackhole

Argh!

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


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

configure.in:
  Auto merged
acinclude.m4:
  SCCS merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

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

the current way of passing '-DBIG_TABLES' to the compilers.

This is needed even in 4.0, as 'Do-compile-all' must use this new approach for
all "max" builds in 4.0, 4.1, and up.


acinclude.m4:
  Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option 
  and set the CPP symbol 'BIG_TABLES' accordingly.
configure.in:
  Call the new 'MYSQL_CHECK_BIG_TABLES' macro.

Backport of ChangeSet 1.1700.256.8: Export the variable MASTER_MY_PORT1 from the place where the second master is started

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

  Safer and mode readable way.


strings/ctype-sjis.c:
  Safer and mode readable way.
strings/ctype-utf8.c:
  Safer and mode readable way.

  More readable and safer way.


strings/ctype-big5.c:
  More readable and safer way.

Bugs#9057: Incorrect errormsg for too-large char field in table definition

handle_connections_shared_memory (double free spotted by Monty).


sql/mysqld.cc:
  Remove excessive my_security_attr_free()

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/usr/home/bar/mysql-4.1

Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to 
activate it.


mysys/charset-def.c:
  Adding Cybozu's patch.
  Not active by default.
strings/ctype-utf8.c:
  Adding Cybozu's patch.
  Not active by default.

into mysql.com:/home/cps/mysql/trees/mysql-4.1

  Corrected typo
mtr_diff.pl:
  A simplified unified diff in Perl
  new file


mysql-test/lib/mtr_diff.pl:
  A simplified unified diff in Perl
mysql-test/mysql-test-run.pl:
  Corrected typo

into mysql.com:/space/pekka/ndb/version/my41

ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  set up long key page vars in ACC_LOCKREQ
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  set up long key page vars in ACC_LOCKREQ

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

BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72:
  Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  compile manually