bzr push into mysql-trunk branch (tor.didriksen:4561 to 4562)

[Tor Didriksen]

 4562 Tor Didriksen	2012-09-26 [merge]
      fix merge jam: merge ../5.6-clean/ --weave

 4561 Akhila Maddukuri	2012-09-26 [merge]
      Description:
      -----------
      After compiling from source, during make test I got the following error:
      
      test main.loaddata failed with error
      CURRENT_TEST: main.loaddata
      mysqltest: At line 592: query 'LOAD DATA INFILE 'tmpp.txt' INTO TABLE t1
      CHARACTER SET ucs2
      (@b) SET a=REVERSE(@b)' failed: 1115: Unknown character set: 'ucs2'
      
      I noticed other tests are skipped because of no ucs2
      main.mix2_myisam_ucs2                    [ skipped ]  Test requires:'
      have_ucs2'
      
      Should main.loaddata be skipped if there is no ucs2
      
      How To Repeat:
      -------------
      Run make test on compiled source that doesn't have ucs2
      
      Suggested fix:
      -------------
      the failing piece of the test should be moved from mysql-test/t/loaddata.test to
      mysql-test/t/ctype_ucs.test.

    modified:
      mysql-test/r/ctype_ucs.result
      mysql-test/r/loaddata.result
      mysql-test/t/ctype_ucs.test
      mysql-test/t/loaddata.test
No bundle (reason: useless for push emails).