Removed CREATE/DROP TABLESPACE and related commands

- DISCARD/IMPORT TABLESPACE are the only tablespace commands left
- TABLESPACE arguments for CREATE TABLE and ALTER ... ADD PARTITION are
  ignored.
- Tablespace names are not shown anymore in .frm and not shown in
  information schema

Other things
- Removed end spaces from sql/CMakeList.txt

libmysqld/CMakeLists.txt

@@ -86,7 +86,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/select_handler.cc
            ../sql/sql_show.cc ../sql/sql_state.c 
            ../sql/sql_statistics.cc ../sql/sql_string.cc
-           ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
+           ../sql/sql_table.cc ../sql/sql_test.cc
            ../sql/ddl_log.cc
            ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
            ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc

mysql-test/main/information_schema_part.result

@@ -7,9 +7,9 @@ partition x3 values in (16, 8, 5+19, 70-43) tablespace ts3);
 select * from information_schema.partitions where table_schema="test"
 and table_name="t1";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-def	test	t1	x1	NULL	1	NULL	LIST	NULL	`b` * `a`	NULL	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts1
-def	test	t1	x2	NULL	2	NULL	LIST	NULL	`b` * `a`	NULL	3,11,5,7	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts2
-def	test	t1	x3	NULL	3	NULL	LIST	NULL	`b` * `a`	NULL	16,8,24,27	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts3
+def	test	t1	x1	NULL	1	NULL	LIST	NULL	`b` * `a`	NULL	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x2	NULL	2	NULL	LIST	NULL	`b` * `a`	NULL	3,11,5,7	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x3	NULL	3	NULL	LIST	NULL	`b` * `a`	NULL	16,8,24,27	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
 create table t2 (a int not null,b int not null,c int not null, primary key(a,b))
 partition by range (a)
 partitions 3
@@ -19,9 +19,9 @@ partition x3 values less than maxvalue tablespace ts3);
 select * from information_schema.partitions where table_schema="test"
 and table_name="t2";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-def	test	t2	x1	NULL	1	NULL	RANGE	NULL	`a`	NULL	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts1
-def	test	t2	x2	NULL	2	NULL	RANGE	NULL	`a`	NULL	10	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts2
-def	test	t2	x3	NULL	3	NULL	RANGE	NULL	`a`	NULL	MAXVALUE	0	0	0	#	1024	0	#	#	NULL	NULL		default	ts3
+def	test	t2	x1	NULL	1	NULL	RANGE	NULL	`a`	NULL	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x2	NULL	2	NULL	RANGE	NULL	`a`	NULL	10	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x3	NULL	3	NULL	RANGE	NULL	`a`	NULL	MAXVALUE	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
 create table t3 (f1 date)
 partition by hash(month(f1))
 partitions 3;
@@ -63,14 +63,14 @@ subpartition x22 tablespace t2)
 );
 select * from information_schema.partitions where table_schema="test" order by table_name, partition_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-def	test	t1	x1	x11	1	1	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	t1
-def	test	t1	x1	x12	1	2	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	t2
-def	test	t1	x2	x21	2	1	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	t1
-def	test	t1	x2	x22	2	2	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	t2
-def	test	t2	x1	x11	1	1	RANGE	KEY	`a`	`a`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	t1
-def	test	t2	x1	x12	1	2	RANGE	KEY	`a`	`a`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	t2
-def	test	t2	x2	x21	2	1	RANGE	KEY	`a`	`a`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	t1
-def	test	t2	x2	x22	2	2	RANGE	KEY	`a`	`a`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	t2
+def	test	t1	x1	x11	1	1	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x1	x12	1	2	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x2	x21	2	1	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t1	x2	x22	2	2	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x1	x11	1	1	RANGE	KEY	`a`	`a`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x1	x12	1	2	RANGE	KEY	`a`	`a`	1	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x2	x21	2	1	RANGE	KEY	`a`	`a`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
+def	test	t2	x2	x22	2	2	RANGE	KEY	`a`	`a`	5	0	0	0	#	1024	0	#	#	NULL	NULL		default	NULL
 drop table t1,t2;
 create table t1 (
 a int not null,
@@ -88,10 +88,10 @@ subpartition x22 tablespace t2 nodegroup 1)
 );
 select * from information_schema.partitions where table_schema="test";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-def	test	t1	x1	x11	1	1	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		0	t1
-def	test	t1	x1	x12	1	2	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		1	t2
-def	test	t1	x2	x21	2	1	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		0	t1
-def	test	t1	x2	x22	2	2	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		1	t2
+def	test	t1	x1	x11	1	1	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		0	NULL
+def	test	t1	x1	x12	1	2	RANGE	HASH	`a`	`a` + `b`	1	0	0	0	#	1024	0	#	#	NULL	NULL		1	NULL
+def	test	t1	x2	x21	2	1	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		0	NULL
+def	test	t1	x2	x22	2	2	RANGE	HASH	`a`	`a` + `b`	5	0	0	0	#	1024	0	#	#	NULL	NULL		1	NULL
 show tables;
 Tables_in_test
 t1

mysql-test/main/mysqld--help.result

@@ -1709,7 +1709,7 @@ performance-schema-max-socket-classes 10
 performance-schema-max-socket-instances -1
 performance-schema-max-sql-text-length 1024
 performance-schema-max-stage-classes 160
-performance-schema-max-statement-classes 222
+performance-schema-max-statement-classes 221
 performance-schema-max-statement-stack 10
 performance-schema-max-table-handles -1
 performance-schema-max-table-instances -1

mysql-test/main/partition_exchange.result

@@ -1306,5 +1306,4 @@ ALTER TABLE t1 ADD PARTITION (PARTITION pm TABLESPACE = `innodb_file_per_table`)
 CREATE TABLE t2 like t1;
 ALTER TABLE t2 REMOVE PARTITIONING;
 ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2;
-ERROR HY000: Non matching attribute 'TABLESPACE' between partition and table
 DROP TABLE t1, t2;

mysql-test/main/partition_exchange.test

@@ -533,7 +533,7 @@ CREATE TABLE t1 (a VARCHAR(200)) PARTITION BY KEY(a) partitions 10;
 ALTER TABLE t1 ADD PARTITION (PARTITION pm TABLESPACE = `innodb_file_per_table`);
 CREATE TABLE t2 like t1;
 ALTER TABLE t2 REMOVE PARTITIONING;
---error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION
+# The following works as table spaces are not checked anymore
 ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2;
 DROP TABLE t1, t2;
 

mysql-test/main/partition_range.result

@@ -294,9 +294,9 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
  PARTITION BY RANGE (`a`)
-(PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
- PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
- PARTITION `x3` VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
+(PARTITION `x1` VALUES LESS THAN (5) ENGINE = MyISAM,
+ PARTITION `x2` VALUES LESS THAN (10) ENGINE = MyISAM,
+ PARTITION `x3` VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 ALTER TABLE t1
 partition by range (a)
 partitions 3
@@ -318,9 +318,9 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
  PARTITION BY RANGE (`a`)
-(PARTITION `x1` VALUES LESS THAN (5) TABLESPACE = ts1 ENGINE = MyISAM,
- PARTITION `x2` VALUES LESS THAN (10) TABLESPACE = ts2 ENGINE = MyISAM,
- PARTITION `x3` VALUES LESS THAN MAXVALUE TABLESPACE = ts3 ENGINE = MyISAM)
+(PARTITION `x1` VALUES LESS THAN (5) ENGINE = MyISAM,
+ PARTITION `x2` VALUES LESS THAN (10) ENGINE = MyISAM,
+ PARTITION `x3` VALUES LESS THAN MAXVALUE ENGINE = MyISAM)
 drop table if exists t1;
 CREATE TABLE t1 (
 a int not null,

mysql-test/main/ps_missed_cmds.result

@@ -771,27 +771,4 @@ EXECUTE stmt_2;
 DROP TABLE t1;
 DEALLOCATE PREPARE stmt_1;
 DEALLOCATE PREPARE stmt_2;
-# Test Test case 25: Check the statements 'CREATE/ALTER/DROP TABLEPSPACE'
-# can be executed as a prepared statement
-PREPARE stmt_1 FROM "CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.ibd' ENGINE=InnoDB";
-PREPARE stmt_2 FROM "ALTER TABLESPACE ts1 ADD DATAFILE 'ts1_1.ibd' ENGINE=InnoDB";
-PREPARE stmt_3 FROM "DROP TABLESPACE ts1 ENGINE=InnoDB";
-EXECUTE stmt_1;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'CREATE TABLESPACE'
-# statement were damaged.
-EXECUTE stmt_1;
-EXECUTE stmt_2;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'ALTER TABLESPACE'
-# statement were damaged.
-EXECUTE stmt_2;
-EXECUTE stmt_3;
-# Execute the same prepared statement the second time to check that
-# no internal structures used for handling the 'DROP TABLESPACE'
-# statement were damaged.
-EXECUTE stmt_3;
-DEALLOCATE PREPARE stmt_1;
-DEALLOCATE PREPARE stmt_2;
-DEALLOCATE PREPARE stmt_3;
 SET default_storage_engine= @save_storage_engine;

mysql-test/main/ps_missed_cmds.test

@@ -585,50 +585,5 @@ DROP TABLE t1;
 DEALLOCATE PREPARE stmt_1;
 DEALLOCATE PREPARE stmt_2;
 
---echo # Test Test case 25: Check the statements 'CREATE/ALTER/DROP TABLEPSPACE'
---echo # can be executed as a prepared statement
-
-PREPARE stmt_1 FROM "CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.ibd' ENGINE=InnoDB";
-PREPARE stmt_2 FROM "ALTER TABLESPACE ts1 ADD DATAFILE 'ts1_1.ibd' ENGINE=InnoDB";
-PREPARE stmt_3 FROM "DROP TABLESPACE ts1 ENGINE=InnoDB";
-
-# Since MariaDB supports for tablespaces only on syntax level disable warnings
-# before run CREATE/ALTER/DROP TABLESPACE statements in order to exclude
-# the following in result output
-#   Warning 1478 Table storage engine 'InnoDB' does not support the create option 'TABLESPACE
---disable_warnings
-
-EXECUTE stmt_1;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'CREATE TABLESPACE'
---echo # statement were damaged.
-# Since the 'CREATE TABLESPACE' statement is supported by MariaDB on syntax
-# level only the second invocation of the CREATE TABLESPACE statement for
-# the same tablespace name doesn't lead to error.
-EXECUTE stmt_1;
-
-EXECUTE stmt_2;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'ALTER TABLESPACE'
---echo # statement were damaged.
-EXECUTE stmt_2;
-
-EXECUTE stmt_3;
---echo # Execute the same prepared statement the second time to check that
---echo # no internal structures used for handling the 'DROP TABLESPACE'
---echo # statement were damaged.
-
-# Since the 'DROP TABLESPACE' statement is supported by MariaDB on syntax
-# level only the second invocation of the DROP TABLESPACE statement for
-# the same tablespace name doesn't lead to an error that tablespace
-# doesn't exist.
-EXECUTE stmt_3;
-
---enable_warnings
-
-DEALLOCATE PREPARE stmt_1;
-DEALLOCATE PREPARE stmt_2;
-DEALLOCATE PREPARE stmt_3;
-
 --enable_ps_protocol
 SET default_storage_engine= @save_storage_engine;

mysql-test/main/signal_code.result

@@ -20,16 +20,16 @@ return 0;
 end $$
 show procedure code signal_proc;
 Pos	Instruction
-0	stmt 130 "SIGNAL foo"
-1	stmt 130 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
-2	stmt 131 "RESIGNAL foo"
-3	stmt 131 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
+0	stmt 129 "SIGNAL foo"
+1	stmt 129 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
+2	stmt 130 "RESIGNAL foo"
+3	stmt 130 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
 drop procedure signal_proc;
 show function code signal_func;
 Pos	Instruction
-0	stmt 130 "SIGNAL foo"
-1	stmt 130 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
-2	stmt 131 "RESIGNAL foo"
-3	stmt 131 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
+0	stmt 129 "SIGNAL foo"
+1	stmt 129 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
+2	stmt 130 "RESIGNAL foo"
+3	stmt 130 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
 4	freturn int 0
 drop function signal_func;

mysql-test/suite/perfschema/r/max_program_zero.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	1
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/ortho_iter.result

@@ -255,7 +255,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/privilege_table_io.result

@@ -57,7 +57,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_disable_idle.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_disable_stages.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_disable_statements.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_disable_transactions.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_disable_waits.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_innodb.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_low_index.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_low_table_lock.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_account.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_cond_class.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_cond_inst.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_file_class.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_file_inst.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_host.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500

mysql-test/suite/perfschema/r/start_server_no_index.result

@@ -135,7 +135,7 @@ performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_sql_text_length	1024
 performance_schema_max_stage_classes	160
-performance_schema_max_statement_classes	222
+performance_schema_max_statement_classes	221
 performance_schema_max_statement_stack	10
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500