Commit 6f1b4bab authored by unknown's avatar unknown

Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents 322397ff 50ca03f6
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