Commit 22b51e25 authored by unknown's avatar unknown

Merge dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl

into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.1-new-rpl


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
parents 9a111f5c fabab792
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