From 3f790104c9d863bdb14a2017c9c1f79fc1999794 Mon Sep 17 00:00:00 2001 From: Eugene Kosov Date: Sun, 29 Oct 2017 00:14:16 +0300 Subject: [PATCH] Tests: full test results innodb.innodb-index-online-fk innodb.instant_alter_debug innodb.innodb_skip_innodb_is_tables sys_vars.sysvars_server_notembedded main.mysqld--help --- mysql-test/r/mysqld--help.result | 2 -- .../innodb/r/innodb-index-online-fk.result | 10 ++++++++++ .../suite/innodb/r/instant_alter_debug.result | 2 +- .../t/innodb_skip_innodb_is_tables.test | 1 - .../r/sysvars_server_notembedded.result | 20 +++++++++---------- sql/handler.cc | 6 ------ sql/handler.h | 1 - 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 682199f60b8..39d600fe7a0 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1277,8 +1277,6 @@ The following options may be given as the first argument: system rows as is on ALTER TABLE; SURVIVE: use DDL survival feature; DROP: delete historical system rows on ALTER TABLE - --versioning-asof-timestamp=name - Default AS OF value for versioned queries --versioning-force Force system versioning for all created tables --versioning-hide=name Hide system versioning from being displayed in table diff --git a/mysql-test/suite/innodb/r/innodb-index-online-fk.result b/mysql-test/suite/innodb/r/innodb-index-online-fk.result index 359ce4a717c..cf405c06834 100644 --- a/mysql-test/suite/innodb/r/innodb-index-online-fk.result +++ b/mysql-test/suite/innodb/r/innodb-index-online-fk.result @@ -124,8 +124,10 @@ SYS_FOREIGN SYS_FOREIGN_COLS SYS_TABLESPACES SYS_VIRTUAL +SYS_VTQ mysql/innodb_index_stats mysql/innodb_table_stats +mysql/vtmd_template test/child test/parent INSERT INTO child VALUES(5,4); @@ -315,8 +317,10 @@ SYS_FOREIGN SYS_FOREIGN_COLS SYS_TABLESPACES SYS_VIRTUAL +SYS_VTQ mysql/innodb_index_stats mysql/innodb_table_stats +mysql/vtmd_template test/child test/parent ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT, @@ -340,8 +344,10 @@ SYS_FOREIGN SYS_FOREIGN_COLS SYS_TABLESPACES SYS_VIRTUAL +SYS_VTQ mysql/innodb_index_stats mysql/innodb_table_stats +mysql/vtmd_template test/child test/parent SHOW CREATE TABLE child; @@ -376,8 +382,10 @@ SYS_FOREIGN SYS_FOREIGN_COLS SYS_TABLESPACES SYS_VIRTUAL +SYS_VTQ mysql/innodb_index_stats mysql/innodb_table_stats +mysql/vtmd_template test/child test/parent SHOW CREATE TABLE child; @@ -412,8 +420,10 @@ SYS_FOREIGN SYS_FOREIGN_COLS SYS_TABLESPACES SYS_VIRTUAL +SYS_VTQ mysql/innodb_index_stats mysql/innodb_table_stats +mysql/vtmd_template test/child test/parent SHOW CREATE TABLE child; diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index b1407aad1f3..0530a462aad 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT; SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS LEFT JOIN t4 ON (NUMERIC_SCALE = pk); COUNT(*) -1734 +1740 SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete'; ALTER TABLE t4 ADD COLUMN c INT; connect dml,localhost,root,,; diff --git a/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test b/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test index 4954191d74a..01ced047302 100644 --- a/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test +++ b/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test @@ -1,5 +1,4 @@ --source include/not_embedded.inc ---source include/have_xtradb.inc select * from information_schema.innodb_trx; select * from information_schema.innodb_locks; diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index 5f417b10d52..ebfbe11ee89 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -5295,27 +5295,27 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE KEEP VARIABLE_SCOPE SESSION VARIABLE_TYPE ENUM -VARIABLE_COMMENT Versioning ALTER TABLE mode +VARIABLE_COMMENT Versioning ALTER TABLE mode. KEEP: leave historical system rows as is on ALTER TABLE; SURVIVE: use DDL survival feature; DROP: delete historical system rows on ALTER TABLE NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST KEEP,SURVIVE,DROP READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL -VARIABLE_NAME VERSIONING_CURRENT_TIMESTAMP -SESSION_VALUE NOW -GLOBAL_VALUE NOW +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME VERSIONING_ASOF_TIMESTAMP +SESSION_VALUE CURRENT +GLOBAL_VALUE CURRENT GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE now +DEFAULT_VALUE CURRENT VARIABLE_SCOPE SESSION VARIABLE_TYPE VARCHAR -VARIABLE_COMMENT Default AS OF value for versioned tables +VARIABLE_COMMENT Default AS OF value for versioned queries NUMERIC_MIN_VALUE NULL NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL -ENUM_VALUE_LIST NULL +ENUM_VALUE_LIST CURRENT,ALL READ_ONLY NO -COMMAND_LINE_ARGUMENT REQUIRED +COMMAND_LINE_ARGUMENT NULL VARIABLE_NAME VERSIONING_FORCE SESSION_VALUE OFF GLOBAL_VALUE OFF @@ -5343,7 +5343,7 @@ NUMERIC_MAX_VALUE NULL NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST AUTO,IMPLICIT,FULL,NEVER READ_ONLY NO -COMMAND_LINE_ARGUMENT OPTIONAL +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME VERSIONING_INNODB_ALGORITHM_SIMPLE SESSION_VALUE ON GLOBAL_VALUE ON diff --git a/sql/handler.cc b/sql/handler.cc index f17d6ac390a..a1c02542928 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2435,12 +2435,6 @@ LEX_CSTRING *handler::engine_name() } -void handler::ha_statistic_increment(ulong SSV::*offset) const -{ - (table->in_use->status_var.*offset)++; -} - - double handler::keyread_time(uint index, uint ranges, ha_rows rows) { /* diff --git a/sql/handler.h b/sql/handler.h index 9478645671c..1f8f25b86b5 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -4124,7 +4124,6 @@ public: TABLE_SHARE* get_table_share() { return table_share; } protected: /* Service methods for use by storage engines. */ - void ha_statistic_increment(ulong SSV::*offset) const; void **ha_data(THD *) const; THD *ha_thd(void) const;