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-4.1-bug7885

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

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

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

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

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

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

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

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

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

prefix", which roots were fixed in 4.0 tree.

TIMESTAMP prefix" into 4.1 tree.

into mysql.com:/home/dlenev/src/mysql-4.0-bg7884

macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".

not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.

into mysql.com:/home/mysql_src/mysql-4.1-clean

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

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

into mysql.com:/home/mysql_src/mysql-4.1-clean

We should not overwrite res if it is returned from a const item.

set to a negative value. (Bug #7700)

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

Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)

and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)

into bob.(none):/home/reggie/bk/mysql-4.1

sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query

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

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