bzr push into mysql-trunk branch (annamalai.gurusami:3873 to 3874)

[Annamalai Gurusami]

 3874 Annamalai Gurusami	2012-04-13 [merge]
      Null merge from mysql-5.5 to mysql-trunk. 

 3873 Mattias Jonsson	2012-04-13
      Bug#11894100: EXCHANGE PARTITION CAN'T BE EXECUTED
      IF ROW_FORMAT WAS SET EXPLICITLY
      
      There was a check for explicitly set ROW_FORMAT when
      comparing tables.
      
      Fix was to compare the real used row_type and set the
      create_info.row_type to the same as the explicitely set
      ROW_FORMAT if both tables used the same row formats.

    modified:
      mysql-test/r/partition_exchange.result
      mysql-test/suite/parts/r/partition_exch_qa_12.result
      mysql-test/suite/parts/t/partition_exch_qa_12.test
      mysql-test/t/partition_exchange.test
      sql/sql_partition_admin.cc
No bundle (reason: useless for push emails).