Commit aa856526 authored by unknown's avatar unknown

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
client/mysqldump.c:
  Merge rpl 5.0->5.1
mysql-test/r/mysqldump.result:
  Merge rpl 5.0->5.1
mysql-test/t/mysqldump.test:
  Merge rpl 5.0->5.1
parents 01bec9b5 370f8ec1
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment