into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/r/rpl_view.result:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/mysqldump.test:
  Manual merge, merge tree 5.0->5.1
mysql-test/t/rpl_view.test:
  Manual merge, merge tree 5.0->5.1