into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


mysql-test/r/temp_table.result:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
sql/sql_select.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.