into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug26675


sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged