-
unknown authored
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build storage/ndb/tools/waiter.cpp: Manual merge from 5.0
9f85d0dc
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build storage/ndb/tools/waiter.cpp: Manual merge from 5.0