into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql


mysql-test/r/partition_pruning.result:
  Auto merged
mysql-test/t/partition_pruning.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged