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

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

  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

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

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

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

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

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

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

  corrected erroneous comparison boolean < 0

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

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

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

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

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

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

embedded server and federated storage engine compiles. (Bug #7920)

out-of-sync test and result.

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

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

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

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

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