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

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

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

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

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

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:/users/lthalmann/bk/mysql-5.1-new

into  mysql.com:/export/space/pekka/ndb/version/my51

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


sql-common/client.c:
  Auto merged

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


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.

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

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


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix

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


BitKeeper/deleted/.del-wait_slave_status.inc:
  Delete: mysql-test/include/wait_slave_status.inc
sql-common/client.c:
  Auto merged

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

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

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


sql-common/client.c:
  Auto merged

  Fixing wrong min_sort_char.


strings/ctype-czech.c:
  Fixing wrong min_sort_char.

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

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged

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

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

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


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

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


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged

storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/ndbapi/NdbBlob.cpp:
  atNextEvent: ignore non-data event
sql/ha_ndbcluster_binlog.cc:
  schema.query => blob
storage/ndb/tools/restore/Restore.cpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/Restore.hpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/restore_main.cpp:
  allow 'system tables' to have blob attrs

5.0.18 by not reseting or accessing the info_buffer member

sql/parse_file.cc:
  Remove unused variable

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

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