into  mysql.com:/misc/mysql/31700/51-31700


sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  manual merge