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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Correction after merge of fix for bug #8614.


mysql-test/t/group_by.test:
  Correction after merge of fix for bug #8614.
mysql-test/r/group_by.result:
  Correction after merge of fix for bug #8614.

mysql-test/t/rpl_ddl.test:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #8614.
sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.


sql/sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.
mysql-test/t/group_by.test:
  Added a test case for bug #8614.
mysql-test/r/group_by.result:
  Added a test case for bug #8614.

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

into mysql.com:/opt/local/work/mysql-5.0-root

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.

Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication


client/mysqltest.c:
  WL#2067: Added if(...) construct to mysqltest
mysql-test/include/rpl_stmt_seq.inc:
  Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
mysql-test/r/rpl_ddl.result:
  Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
mysql-test/t/rpl_ddl.test:
  Comment

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

into mysql.com:/opt/local/work/mysql-5.0-root

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:/opt/local/work/mysql-5.0-root

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