Using it comes merged from 4.1.


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

  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 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).

  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:/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

client/mysqltest.c:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  SCCS merged
sql/sql_union.cc:
  DBUG_ASSERT(TRUE) is useless so assume opposite

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

into mysql.com:/export/space/pekka/ndb/version/my50

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

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged

  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.

  Post merge additional fix for DECIMAL type:
  Bugs: #9425: A user variable doesn't always have implicit coercibility


sql/item_func.cc:
  Post merge additional fix for DECIMAL type:
  Bugs: #9425: A user variable doesn't always have implicit coercibility

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/item_func.cc:
  Auto merged

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

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

into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged

  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"

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita