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


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  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  shellback.(none):/home/msvensson/mysql/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  enabled rpl_ndb_blob since a "hanging" bug was fixed


mysql-test/t/disabled.def:
  enabled rpl_ndb_blob since a "hanging" bug was fixed

into  mysql.com:/usr/home/bar/mysql-5.1-new

- make sure cluster/schema table is always created first


sql/ha_ndbcluster_binlog.cc:
  make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug causing hang in getTable when using blob tables

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

into  zim.(none):/home/brian/mysql/dep-5.1

 - Make the windows implementation of 'my_dir' behave like the default implementation


mysys/my_lib.c:
  If 'findfirst' returns EINVAL, just continue and return 0 files to read in this dir.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged

- check that event is the correct one, and only delete if wrong version

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  zim.(none):/home/brian/mysql/dep-5.1

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


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

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

  Forgot to include into the previous changeset.


strings/ctype-simple.c:
  Forgot to include into the previous changeset.
strings/ctype-utf8.c:
  Forgot to include into the previous changeset.

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


client/mysqltest.c:
  Auto merged
sql/sql_error.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

into  zim.(none):/home/brian/mysql/dep-5.1

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

into  mysql.com:/usr/home/bar/mysql-5.1-new

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

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  zim.(none):/home/brian/mysql/dep-5.1

sql/ha_innodb.cc:
  Removing dead code
sql/handler.cc:
  Removing dead code
sql/handler.h:
  Removing Dead code
sql/sql_class.cc:
  Removing unneeded ifdef code.
sql/sql_repl.cc:
  Removing dead code.

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

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new