Reproduced in 5.0.16-nt. Tested to work in 5.0.20
  


mysql-test/r/group_min_max.result:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20
mysql-test/t/group_min_max.test:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20

netware/BUILD/compile-netware-START:
  added option for netware builds

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

If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking 
possible conversions of outer joins into joins for such queries.


mysql-test/r/join_outer.result:
  Added a test case for bug #17164.
mysql-test/t/join_outer.test:
  Added a test case for bug #17164.

tables corrupt triggers".

It turned out that we also have relied at certain places that
(new_table != table_name) were always true on Windows and for transactional
tables. Since our fix for the bug brakes this assumption we have to add new
flag to pass this information around.
This code needs to be refactored but I dare not to do this in 5.0.


sql/sql_table.cc:
  mysql_alter_table():
    Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on
    transactional tables corrupt triggers". It turned out that we also have
    relied at certain places that (new_table != table_name) were always true
    on Windows and for transactional tables. Since our fix for the bug brakes
    this assumption we have to add new flag to pass this information around.
    This code needs to be refactored but I dare not to do this in 5.0.

into  mysql.com:/home/dlenev/mysql-5.0-bg18153

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  mysql.com:/home/dlenev/mysql-5.0-bg18153

triggers".

Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to
table of any type on Windows caused disappearance of its triggers.
Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not
keep info of triggers" (see comment for sql_table.cc for more info).
.


mysql-test/r/trigger.result:
  Added test-case covering handling of triggers when one does ALTER TABLE which
  should move table to different database.
mysql-test/t/trigger.test:
  Added test-case covering handling of triggers when one does ALTER TABLE which
  should move table to different database.
sql/sql_table.cc:
  mysql_alter_table():
    Removal of strdup() which is no longer necessary allows us to preserve
    nice assumption that "(new_db != db || new_table != table_name) indicates
    that table will be renamed. So now we really can use this condition to
    avoid updating trigger definitions when table is not renamed.
    Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead
    since it can be also true when we do "ALTER TABLE t1 RENAME TO t1".
sql/sql_trigger.cc:
  Table_triggers_list::change_table_name():
    Mentioned assumption that subject table is not renamed to itself in method
    description. Added DBUG_ASSERT() to catch wrong usage of this method.
mysql-test/r/trigger-trans.result:
  New BitKeeper file ``mysql-test/r/trigger-trans.result''
mysql-test/t/trigger-trans.test:
  New BitKeeper file ``mysql-test/t/trigger-trans.test''

sql/udf_example.cc:
  Calculate length of returned string correctly

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

Apparently libtool isn't properly setup on all our build hosts.


mysql-test/mysql-test-run.pl:
  Only run in libtool if running in valgrind.

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

client/mysqltest.c:
  Dump accumulated result upuntil test failure into a <testname>.log file for later examination
mysql-test/lib/mtr_report.pl:
  Inform about the <testname>.log file's existence

Concat type+idx to get a unique gdbinit filename

into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
include/config-win.h:
  SCCS merged

  If CYBOZU defined, set character sets etc


include/config-win.h:
  If CYBOZU defined, set character sets etc

Touchups


mysql-test/mysql-test-run.pl:
  Add support fo --manual-debug, --manual-gdb and -manual-ddd

into  shellback.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge

Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted', shared locking is sufficient


sql/ha_ndbcluster.cc:
  Post review fix of Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transacti

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

mysql-test/r/subselect.result:
  Fix for bug #18306: MySQL crashes and restarts using subquery
  test case
mysql-test/t/subselect.test:
  Fix for bug #18306: MySQL crashes and restarts using subquery
  test case
sql/opt_range.cc:
  Fix for bug #18306: MySQL crashes and restarts using subquery
  Restore thd->mem_root because
  during the cond->val_int() evaluation we can come across a subselect 
  item which may allocate memory on the thd->mem_root and assumes
  all the memory allocated has the same life span as the subselect
  item itself.

Add support for debuggers and impove support for valgrind


mysql-test/mysql-test-run.pl:
  Add support for debuggers and improve support for valgrind

Makes it easier to see what happened before the failure


client/mysqltest.c:
  Dump reject file before mysqltest in 'die'

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

into  mysql.com:/usr/home/bar/mysql-4.1.b15376


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

into  mysql.com:/users/lthalmann/bk/mysql-5.0

  Bug##15376
  After merge fix: removing redundant macros.


include/m_ctype.h:
  Bug##15376
  After merge fix: removing redundant macros.

Mergeing changes into 5.0


mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  After merge fix
mysql-test/t/ctype_eucjpms.test:
  Adding test
strings/ctype-cp932.c:
  After merge fix
strings/ctype-eucjpms.c:
  Applying changes to eucjpms, similar to ujis.
  Note: eucjpms appeared in 5.0 so the original patch,
  which was for for 4.1, didn't fix eucjpms.

  Removing duplicate old definition.
  After merge fix for bug#15375


include/m_ctype.h:
  Removing duplicate old definition.
  After merge fix for bug#15375