Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

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


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
This commit is contained in:
unknown 2005-12-07 12:59:44 +01:00
commit 20f59cd255

Diff content is not available