-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 include/my_global.h: Auto merged mysql-test/t/ndb_autodiscover.test: Auto merged mysql-test/r/ndb_autodiscover.result: Merge
f5e8ed5c
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 include/my_global.h: Auto merged mysql-test/t/ndb_autodiscover.test: Auto merged mysql-test/r/ndb_autodiscover.result: Merge