Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged