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

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B

into mysql.com:/home/timka/mysql/src/5.0-dbg

Exclude the query that generates warning from PS tests, due to extra warning
under PS.

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B

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


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged

into mysql.com:/M50/mysql-5.0

ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ul

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

into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-B

configure.in:
  Correct equality comparison: In shell 'test', it is single '=' (bug#11007).

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

Merge with latest yaSSL.


extra/yassl/include/lock.hpp:
  Merge with latest yaSSL.
extra/yassl/include/socket_wrapper.hpp:
  Merge with latest yaSSL.
extra/yassl/mySTL/helpers.hpp:
  Merge with latest yaSSL.
extra/yassl/src/lock.cpp:
  Merge with latest yaSSL.
extra/yassl/src/log.cpp:
  Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
  Merge with latest yaSSL.
extra/yassl/src/timer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/misc.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/random.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/types.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/asn.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/random.cpp:
  Merge with latest yaSSL.

into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132

into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132

mysql-test/include/show_msg80.inc:
  Post review fixes: improved description
mysql-test/r/mysqltest.result:
  Updated result
mysql-test/t/mysqltest.test:
  one sub testcase added

into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B

into mysql.com:/home/gluh/MySQL/Merge/5.0

  added ability to do SHOW CREATE DATABASE `information_schema`

This fixes the problem in 5.0 in the correct way.

The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.


ndb/src/kernel/main.cpp:
  The ndbd angel process keeps the mgm connection open as it retains a reference
  to the socket.
  
  this means that when the mgm server is killed, the socket stays in CLOSE_WAIT 
  (the ndb process will close() it okay in 5.0, as we reused it for a transporter
  but this isn't enough as the angel process still has a reference to that socket).
  
  so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
  process is left with the only reference to the socket - which it can close whenever
  it likes (namely when the connection is terminated).

mysql-test/r/bdb_cache.result:
  fix test results
mysql-test/t/bdb_cache.test:
  fix test results

into mysql.com:/usr/home/ram/work/mysql-5.0

mysys/charset.c:
  a fix (bug #10650: Bit literal case sensitivity).
  typo fixed.

ndb/src/common/transporter/TransporterRegistry.cpp:
  fix debug string for TR::report_disconnect

The 4.1 fix is not valid for 5.0. Remove it.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  This fix is not valid for 5.0 as we use the mgm server connection for more than
  just fetching the initial configuration

into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged

portability alignment issues.

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


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Item_buff -> Cached_item
  Item_arena -> Query_arena
  TEST_ASSERT -> YYERROR_UNLESS


sql/item.h:
  renamed:
    Item_buff -> Cached_item
sql/item_buff.cc:
  renamed:
    Item_buff -> Cached_item
sql/item_func.cc:
  renamed:
    Item_arena -> Query_arena
sql/item_subselect.cc:
  renamed:
    Item_arena -> Query_arena
sql/sp_head.cc:
  renamed:
    Item_arena -> Query_arena
sql/sp_head.h:
  renamed:
    Item_arena -> Query_arena
sql/sql_base.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_class.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_class.h:
  renamed:
    Item_arena -> Query_arena
sql/sql_lex.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_prepare.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_select.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_select.h:
  renamed:
    Item_buff -> Cached_item
    Item_arena -> Query_arena
sql/sql_union.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_view.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_yacc.yy:
  renamed:
    TEST_ASSERT -> YYERROR_UNLESS
sql/table.cc:
  renamed:
    Item_arena -> Query_arena

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

- replace @message by $message
  --> The annoying protocol line "SET @message= <value>" will disappear.
- extended description
- some examples added


mysql-test/include/show_msg.inc:
  replace @message by $message
mysql-test/include/show_msg80.inc:
  - replace @message by $message
  - extended description
  - some examples added
mysql-test/r/mysqltest.result:
  updated results
mysql-test/t/mysqltest.test:
  sub testcases for the show_msg*.inc scripts modified, because the script properties are altered

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

sql/field.cc:
  Auto merged

  Added test case for bug #11283.
field.h, field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.


sql/field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
sql/field.h:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
mysql-test/t/cast.test:
  Added test case for bug #11283.
mysql-test/r/cast.result:
  Added test case for bug #11283.

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


strings/decimal.c:
  Auto merged

mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
strings/decimal.c:
  handling of round_digit changed - we have to check all the digits after
  the point if round_digit is 0

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


strings/decimal.c:
  Auto merged

mysql-test/r/cast.result:
  test result fixed
mysql-test/t/cast.test:
  test case added
sql/item_func.cc:
  checks for NULL added
strings/decimal.c:
  we need to return specified 'scale' for the rounded decimal