BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Merge from 4.0 and 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-5.0-compile


Build-tools/Do-compile:
  Auto merged

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

  Added option --with-blackhole


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

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

Using it comes merged from 4.1.


config/ac-macros/misc.m4:
  Implement the new '--with-big-tables' flag to "configure".

Incomplete, as the macro body must ne in the new file 'config/ac-macros/misc.m4'
which will follow in a separate changeset.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Merge the 4.0 and 4.1 change of the new '--with-big-tables' flag.
configure.in:
  Call the new macro to evaluate the '--with-big-tables' flag.
mysql-test/mysql-test-run.sh:
  No change in 5.0, as 4.1 was a backport (Martin).
mysql-test/r/ps_7ndb.result:
  Merge from 4.1 (Martin).

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

  Updates to be in sync with 'mysql_create_system_tables'


mysql-test/lib/init_db.sql:
  Updates to be in sync with 'mysql_create_system_tables'

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

into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod

making Q_CATALOG_CODE be understood by 5.0.4 slave, so that 5.0.3->5.0.4 repl can work (but 5.0.4->5.0.3 won't).

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-5.0

  after merge fix
  ,


mysql-test/r/type_bit.result:
  after merge fix
  ,

mysys/charset-def.c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
mysql-test/r/type_blob.result:
  after merge fix

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

  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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


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

  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