Merge mysql-5.7 to mysql-trunk for Bug#21687636

Author: Darshan M N

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

@@ -47,16 +47,32 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='ZLIB'
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME LIKE '%t1';
-NAME	COMPRESSION
-test/t1	Zlib
+NAME
+test/t1
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='ZLIB'
 SELECT * FROM t1;
 c1
 1
 2
 3
 4
+#
+# Bug#21687636 COMPRESSION COLUMN IN INNODB_SYS_TABLESPACES IS NOT CORRECT
+#
+# restart
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='ZLIB'
 ALTER TABLE t1 COMPRESSION = "BLAH";
 ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'COMPRESSION'
 SHOW WARNINGS;
@@ -80,11 +96,17 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='NONE'
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES
 WHERE NAME LIKE '%t1';
-NAME	COMPRESSION
-test/t1	None
+NAME
+test/t1
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  PRIMARY KEY (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='NONE'
 SELECT * FROM t1;
 c1
 1
@@ -143,11 +165,16 @@ FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='test' AND TABLE_NAME = 't1';
 TABLE_NAME	CREATE_OPTIONS
 t1	COMPRESSION="abcdefg"
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES
 WHERE NAME LIKE '%t1';
-NAME	COMPRESSION
-test/t1	None
+NAME
+test/t1
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `C1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMPRESSION='abcdefghijklmnopqrstuvwxyz'
 DROP TABLE t1;
 CREATE TABLE t1(c1 INT) KEY_BLOCK_SIZE=1 COMPRESSION='NONE';
 DROP TABLE t1;

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

@@ -57,10 +57,17 @@ ALTER TABLE t1 COMPRESSION = "ZLIB";
 OPTIMIZE TABLE t1;
 SHOW CREATE TABLE t1;
 
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME LIKE '%t1';
+SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 
+--echo #
+--echo # Bug#21687636 COMPRESSION COLUMN IN INNODB_SYS_TABLESPACES IS NOT CORRECT
+--echo #
+-- source include/restart_mysqld.inc
+SHOW CREATE TABLE t1;
+
 --error ER_ILLEGAL_HA_CREATE_OPTION
 ALTER TABLE t1 COMPRESSION = "BLAH";
 SHOW WARNINGS;
@@ -71,9 +78,10 @@ ALTER TABLE t1 COMPRESSION = "NONE";
 # Force all pages to the new compression mode
 OPTIMIZE TABLE t1;
 SHOW CREATE TABLE t1;
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES
 WHERE NAME LIKE '%t1';
+SHOW CREATE TABLE t1;
 SELECT * FROM t1;
 
 
@@ -127,9 +135,10 @@ SELECT TABLE_NAME, CREATE_OPTIONS
 FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='test' AND TABLE_NAME = 't1';
 
-SELECT NAME, COMPRESSION
+SELECT NAME
 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES
 WHERE NAME LIKE '%t1';
+SHOW CREATE TABLE t1;
 
 DROP TABLE t1;
 

storage/innobase/handler/i_s.cc

@@ -8300,15 +8300,6 @@ static ST_FIELD_INFO	innodb_sys_tablespaces_fields_info[] =
 	 STRUCT_FLD(old_name,           ""),
 	 STRUCT_FLD(open_method,        SKIP_OPEN_TABLE)},
 
-#define SYS_TABLESPACES_COMPRESSION	10
-	{STRUCT_FLD(field_name,		"COMPRESSION"),
-	 STRUCT_FLD(field_length,	MAX_COMPRESSION_LEN + 1),
-	 STRUCT_FLD(field_type,		MYSQL_TYPE_STRING),
-	 STRUCT_FLD(value,		0),
-	 STRUCT_FLD(field_flags,	0),
-	 STRUCT_FLD(old_name,		""),
-	 STRUCT_FLD(open_method,	SKIP_OPEN_TABLE)},
-
 	END_OF_ST_FIELD_INFO
 
 };
@@ -8420,12 +8411,6 @@ i_s_dict_fill_sys_tablespaces(
 
 	OK(fields[SYS_TABLESPACES_ALLOC_SIZE]->store(file.m_alloc_size, true));
 
-	Compression::Type	type = fil_get_compression(space);
-
-	OK(field_store_string(
-			fields[SYS_TABLESPACES_COMPRESSION],
-			Compression::to_string(type)));
-
 	OK(schema_table_store_record(thd, table_to_fill));
 
 	DBUG_RETURN(0);