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

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

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

tests/client_test.c:
  Fixes for Solaris: 
  a) no truncation in one place (ulonglong -> double)
  b) fix a glitch with byte order and passing int * instead of char *
     as a statement attribute

out-of-sync test and result.


mysql-test/r/type_float.result:
  Warning message text changed
mysql-test/t/symlink.test:
  Re-enable part of test
mysql-test/r/symlink.result:
  Update results to match test

mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/table.cc:
  Merge warning of multi-byte charset being applied
  to table of unknown charset.

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

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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

mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's

mysql-test/r/type_float.result:
  Update test results (4.1 produces a warning that 4.0 did not,
  and they were merged into the wrong position).

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

sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge

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

client/Makefile.am:
  Don't use relative paths.

into mysql.com:/home/dlenev/src/mysql-5.0-merges


client/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into mysql.com:/home/dlenev/src/mysql-4.1-merges

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

  after merge clean-up


mysql-test/r/ps_6bdb.result:
  after merge clean-up
mysql-test/r/ps_7ndb.result:
  after merge clean-up

into mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/field.h:
  Auto merged

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

The old syntax works as well. WL#2356.

mysql-test/r/metadata.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

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

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

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

compile warning: changed eq_range -> eq_r