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


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

innobase/include/ut0mem.h:
  Add const qualifiers and remove unused function ut_str_catenate()
innobase/include/ut0mem.ic:
  Add const qualifiers
innobase/ut/ut0mem.c:
  Remove unused function ut_str_catenate()

innobase/os/os0file.c:
  Disable os_file_lock() on FreeBSD

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

This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.

  Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.


sql/sql_table.cc:
  Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.

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

into mc05.(none):/space/tomas/mysql-4.1-ndb

into mc05.(none):/space/tomas/mysql-4.1-ndb

into deer.(none):/home/hf/work/mysql-4.1.ps

into mc05.(none):/space2/tomas/mysql-4.1

ndb/src/ndbapi/Ndberr.cpp:
  Rename: ndb/src/ndbapi/Ndberror.cpp -> ndb/src/ndbapi/Ndberr.cpp

into mc05.(none):/space/tomas/mysql-4.1-ndb


ndb/src/common/transporter/Makefile:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.ps

something in embedded PS


BitKeeper/etc/ignore:
  Added libmysqld/examples/client_test.c to the ignore list
libmysqld/examples/Makefile.am:
  tests/client_test is now symlinked to libmysqld/examples catalog
  then it's built with libmysqld.a

into mc05.(none):/space/tomas/mysql-4.1-ndb

into build.mysql.com:/users/tulin/mysql-4.1

  fixed typo


ndb/bin/regression.sh:
  fixed typo

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

  oops forgot this one


ndb/include/portlib/NdbMutex.h:
  oops forgot this one

into mc05.(none):/space/tomas/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1

ndb/src/cw/cpcd/Process.cpp:
  Fix broken arg for getrlimit

ndb/config/Defs.LINUX.x86.GCC.mk:
  postability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  postability/autoconf fixes
ndb/src/common/editline/unix.h:
  postability/autoconf fixes
ndb/src/common/portlib/memtest/memtest.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbTCP.c:
  postability/autoconf fixes
ndb/src/common/portlib/unix/NdbThread.c:
  postability/autoconf fixes
ndb/src/common/transporter/Makefile:
  postability/autoconf fixes
ndb/src/common/transporter/SHM_Transporter.cpp:
  postability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  postability/autoconf fixes

into mysql.com:/home/mydev/mysql-4.1-wl1687

into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/newtonapi/defs/pcn_types.h:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  Auto merged
ndb/src/common/portlib/unix/NdbCondition.c:
  Auto merged
ndb/src/common/portlib/unix/NdbDaemon.c:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/strlcat.c:
  Auto merged
ndb/src/common/util/strlcpy.c:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/test/ndbapi/flexBench/flexBench.cpp:
  Auto merged
ndb/test/src/HugoCalculator.cpp:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbConfig.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/cpcc/cpcc.cpp:
  Auto merged

ndb/include/newtonapi/defs/pcn_types.h:
  portability/autoconf fixes
ndb/include/portlib/NdbMutex.h:
  portability/autoconf fixes
ndb/src/common/editline/editline.c:
  portability/autoconf fixes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbCondition.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbDaemon.c:
  portability/autoconf fixes
ndb/src/common/portlib/unix/NdbHost.c:
  portability/autoconf fixes
ndb/src/common/util/File.cpp:
  portability/autoconf fixes
ndb/src/common/util/getarg.c:
  portability/autoconf fixes
ndb/src/common/util/strlcat.c:
  portability/autoconf fixes
ndb/src/common/util/strlcpy.c:
  portability/autoconf fixes
ndb/src/cw/cpcd/Process.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/common.cpp:
  portability/autoconf fixes
ndb/src/cw/cpcd/main.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdict/printSchemafile/printSchemafile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp:
  portability/autoconf fixes
ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp:
  portability/autoconf fixes
ndb/src/kernel/error/TimeModule.cpp:
  portability/autoconf fixes
ndb/src/kernel/ndb-main/Main.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  portability/autoconf fixes
ndb/src/mgmsrv/main.cpp:
  portability/autoconf fixes
ndb/test/ndbapi/flexBench/flexBench.cpp:
  removed warnings
ndb/test/src/HugoCalculator.cpp:
  removed warnings
ndb/test/src/HugoOperations.cpp:
  removed warnings
ndb/test/src/HugoTransactions.cpp:
  removed warnings
ndb/test/src/NDBT_ResultRow.cpp:
  removed warnings
ndb/test/src/NdbBackup.cpp:
  removed warnings
ndb/test/src/NdbConfig.cpp:
  removed warnings
ndb/test/src/NdbRestarter.cpp:
  removed warnings
ndb/tools/cpcc/cpcc.cpp:
  removed warnings

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

scripts/mysql_install_db.sh:
  Portability fix (! is not portable)
sql/item_func.cc:
  Use my_strtoll10() instead of strtoull()
sql/repl_failsafe.cc:
  Use my_strtoll10() instead of strtoull()
sql/sql_analyse.cc:
  Use my_strtoll10() instead of strtoull()
sql/sql_yacc.yy:
  Use my_strtoll10() instead of strtoull()
strings/my_strtoll10.c:
  Fix compiler warnings

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1

sql/examples/ha_example.cc:
  Documentation updates (lots of comments in the code).
sql/examples/ha_example.h:
  Documenation update, lots of comments in the code.