Merge branch 'mysql-5.6' into mysql-5.7

Author: sachinagarwal1111

mysql-test/suite/innodb/r/innodb-alter.result

@@ -836,8 +836,7 @@ id int(11) NOT NULL AUTO_INCREMENT,
 body text COLLATE utf8_unicode_ci,
 PRIMARY KEY (id)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
-COLLATE=utf8_unicode_ci
-ROW_FORMAT=COMPRESSED;
+COLLATE=utf8_unicode_ci;
 ALTER TABLE notes ADD FULLTEXT INDEX index_ft_body (body(255));
 Warnings:
 Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID

mysql-test/suite/innodb/t/innodb-alter.test

@@ -475,8 +475,7 @@ CREATE TABLE notes (
    body text COLLATE utf8_unicode_ci,
    PRIMARY KEY (id)
    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8
-COLLATE=utf8_unicode_ci
-ROW_FORMAT=COMPRESSED;
+COLLATE=utf8_unicode_ci;
 
 ALTER TABLE notes ADD FULLTEXT INDEX index_ft_body (body(255));
 DROP INDEX index_ft_body ON notes;