into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/type_bit.test:
  Auto merged
sql/sql_select.cc:
  Merge with 5.0-opt.