Argh!

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


mysql-test/r/ps_7ndb.result:
  Auto 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

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

  Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.


mysql-test/t/union.test:
  Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
  Prove that this problem was fixed with bug9425 fix too.

Coercibility fixes for numeric types and not defined values were done.

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

  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.


mysql-test/r/ctype_utf8.result:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/r/func_system.result:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/ctype_utf8.test:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/func_system.test:
  Prove that the queries mentioned in
  Bugs#5980: NULL requires a characterset in a union
  works fine after recent changes related to itroducing
  more coercibility level: IRNORABLE and SYSCONST.

myisam/mi_create.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  merged with ul

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


acinclude.m4:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged

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

sql/sql_acl.cc:
  don't use acl_cache for GRANT
sql/sql_parse.cc:
  fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"

provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.


VC++Files/mysys/mysys.dsp:
  Add my_windac.c to mysys.lib
include/my_sys.h:
  Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
  Add my_windac.c to the list of compiled files.
sql-common/client.c:
  Lower requested access rights for events as the server won't 
  provide clients with ALL access in order to prevent denial
  of service attack.
sql/mysqld.cc:
  Set proper security attributes for the kernel objects to make them
  usable when mysqld is running as a Windows service.

libmysqld/Makefile.am:
  Adding ha_blackhole.cc

mysql-test/r/ps_1general.result:
  Fix test case.
sql/handler.h:
  Added federated to the list so that any beta users won't end up with a mismatch for table enum

into zim.(none):/home/brian/mysql/mysql-4.1

into mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean

  Don't run GBK test if not GBK support was compiled.


tests/mysql_client_test.c:
  Don't run GBK test if not GBK support was compiled.