Commit 2dca4e9f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/kk 

into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/cw/cpcd/main.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
parents 477f1e2f 828c4633

There are no changes