into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

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

into mysql.com:/home/psergey/mysql-5.0-fix-vg1

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

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

  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
configure.in:
  Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.

into mysql.com:/usr/home/bar/mysql-5.0


configure.in:
  Auto merged

  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.

  new file

into mysql.com:/dbdata/psergey/mysql-5.0-bug7885


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

into mysql.com:/dbdata/psergey/mysql-4.1-bug7885

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

BUILD/SETUP.sh:
  Add --with-federated-storage-engine to max_configs

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


BitKeeper/deleted/.del-compile-amd64-debug-max:
  Delete: BUILD/compile-amd64-debug-max
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-compile-amd64-max:
  Delete: BUILD/compile-amd64-max

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

(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers

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

  corrected erroneous comparison boolean < 0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  corrected erroneous comparison boolean < 0

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

extra/comp_err.c:
  WARN_PREFIX added.

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999

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


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

ndb/include/ndb_constants.h:
  remove // from .h-file

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


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

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

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


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

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

  remove usage of compiler supplied <new> and instead
  impl. own inlined placement new


ndb/include/kernel/AttributeHeader.hpp:
  remove usage <new>
ndb/include/ndb_global.h.in:
  remove usage <new>
  instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
  remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
  remove usage <new>

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999


mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged

sql/share/errmsg.txt:
  A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation).
  ER_DATA_TOO_LONG (22001) has been added.

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


configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

  when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout

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