into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


sql/handler.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_rcontext.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/include/read_many_rows.inc:
  Manually merged
mysql-test/r/read_many_rows_innodb.result:
  Manually merged
sql/sql_class.cc:
  Manually merged
sql/sql_class.h:
  Manually merged
storage/innobase/handler/ha_innodb.cc:
  Manually merged