Commit ff3660df authored by unknown's avatar unknown
Browse files

Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345 

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345


mysql-test/r/ctype_utf8.result:
  Auto merged
storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
parents a95b4dc6 088c31a2

There are no changes