bzr push into mysql-trunk branch (kevin.lewis:4360 to 4361)

[kevin.lewis]

 4361 kevin.lewis@stripped	2012-08-28 [merge]
      Merge

    modified:
      mysql-test/suite/innodb/r/innodb-tablespace.result
      mysql-test/suite/innodb/t/innodb-tablespace.test
 4360 Tor Didriksen	2012-08-28 [merge]
      empty merge 5.6 => trunk

=== modified file 'mysql-test/suite/innodb/r/innodb-tablespace.result'
--- a/mysql-test/suite/innodb/r/innodb-tablespace.result	revid:tor.didriksen@stripped
+++ b/mysql-test/suite/innodb/r/innodb-tablespace.result	revid:kevin.lewis@stripped
@@ -100,7 +100,8 @@ FROM information_schema.innodb_sys_table
 name	n_cols	file_format	row_format
 test/t1	5	Antelope	Compact
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces ORDER BY name;
+FROM information_schema.innodb_sys_tablespaces
+ORDER BY name;
 name	file_format	row_format
 mysql/innodb_index_stats	Antelope	Compact or Redundant
 mysql/innodb_table_stats	Antelope	Compact or Redundant

=== modified file 'mysql-test/suite/innodb/t/innodb-tablespace.test'
--- a/mysql-test/suite/innodb/t/innodb-tablespace.test	revid:tor.didriksen@stripped
+++ b/mysql-test/suite/innodb/t/innodb-tablespace.test	revid:kevin.lewis@stripped
@@ -94,7 +94,8 @@ SHOW CREATE TABLE t1;
 SELECT name,n_cols,file_format,row_format
        FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%';
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces ORDER BY name;
+       FROM information_schema.innodb_sys_tablespaces
+       ORDER BY name;
 --replace_regex /emp#P#/emp#p#/
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT path FROM information_schema.innodb_sys_datafiles

No bundle (reason: useless for push emails).