sql/field.cc:
  method getting maximum display length for fields
sql/field.h:
  method getting maximum display length for fields
sql/item.cc:
  code cleanup
  switch replaced with new method
sql/item.h:
  method getting maximum display length for fields

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-4030

  Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet


innobase/fil/fil0fil.c:
  Remove the use of mem_realloc in fil0fil.c; mem_alloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet

into mysql.com:/home/kostja/mysql/mysql-4.1-4030

include/mysql.h:
  mysql_bind_param -> mysql_stmt_bind_param
libmysql/libmysql.c:
  - more comments
  - trailing spaces stripped
  - update_statement_metadata moved to appropriate section (from 'Statement
  close and error reporting' section)
  - store_param_type moved to store_ functions

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: ndb/bin/mysqlclusterd
.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster


BitKeeper/deleted/.del-mysqlcluster~26c9c37938503734:
  Delete: ndb/bin/mysqlcluster
BitKeeper/deleted/.del-mysqlcluster_install_db~f363f803506081a6:
  Delete: ndb/bin/mysqlcluster_install_db
BitKeeper/deleted/.del-mysqlclusterd~7ebaf8faea0a1100:
  Delete: ndb/bin/mysqlclusterd

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1

into mysql.com:/space/my/mysql-4.1

- mutex was unlocked before the end of the critical sesion,
- Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
  if alloc is a function passed as an argument.
- Use {} around if() block, to avoid possible problems with some Windows compilers.

  missing file


ndb/include/Makefile.am:
  missing file

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

mysql-test/r/subselect.result:
  new length in UNION
mysql-test/r/union.result:
  new length in UNION
  test of int with wrong display length
mysql-test/t/union.test:
  test of int with wrong display length
sql/item.cc:
  new length detection for non-string
sql/item.h:
  new length detection for non-string

   enabled


Build-tools/Do-compile:
   - removed redundant option "--without-ndbcluster" (we already have
     "--with-cluster" for that)
   - make sure to add the cluster files in the binary distribution
   - make sure to run mysql-test-run with NDB tests enabled

pops up fixed.


libmysql/libmysql.c:
  Another place where Bug#4079 pops up fixed.

  fix up test result.


mysql-test/r/alter_table.result:
  fix up test result.
mysql-test/r/packet.result:
  fix up test result.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

and affected test results.

  Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name


innobase/row/row0ins.c:
  Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name

  introduced in ChangeSet@1.1843.1.25
InnoDB: fix bug in the error exit of
  fil_create_new_single_table_tablespace(), introduced in
  ChangeSet@1.1843.1.11


innobase/row/row0ins.c:
  row_ins_foreign_check_on_constraint():
   the string passed to innobase_invalidate_query_cache() was truncated;
   now it is passed correctly again
innobase/fil/fil0fil.c:
  fil_create_new_single_table_tablespace():
   delete the file if fil_space_create() fails

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

and affected test results.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-4.1

   (to disable assertions)


include/my_dbug.h:
   - make sure to define NDEBUG, when DBUG_OFF is defined (to disable
     assertions)

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


configure.in:
  Auto merged

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


sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

into mysql.com:/space/my/mysql-4.1

sql/item_strfunc.cc:
  We don't need tmp_value member here.
sql/item_strfunc.h:
  We don't need tmp_value member here.

   (too few arguments)


regex/regcomp.c:
   - compile fix spotted on Mac OS X (too few arguments)