database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Tests: full test results

Browse Source 
innodb.innodb-index-online-fk
innodb.instant_alter_debug
innodb.innodb_skip_innodb_is_tables
sys_vars.sysvars_server_notembedded
main.mysqld--help
This commit is contained in:
Eugene Kosov
2017-10-29 00:14:16 +03:00
committed by Aleksey Midenkov
parent d47dc0747b
commit 3f790104c9
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqld--help.result
View File

@@ -1277,8 +1277,6 @@ The following options may be given as the first argument:
system rows as is on ALTER TABLE; SURVIVE: use DDL system rows as is on ALTER TABLE; SURVIVE: use DDL
survival feature; DROP: delete historical system rows on survival feature; DROP: delete historical system rows on
ALTER TABLE ALTER TABLE
--versioning-asof-timestamp=name
Default AS OF value for versioned queries
--versioning-force Force system versioning for all created tables --versioning-force Force system versioning for all created tables
--versioning-hide=name --versioning-hide=name
Hide system versioning from being displayed in table Hide system versioning from being displayed in table

10
mysql-test/suite/innodb/r/innodb-index-online-fk.result
View File

@@ -124,8 +124,10 @@ SYS_FOREIGN
SYS_FOREIGN_COLS SYS_FOREIGN_COLS
SYS_TABLESPACES SYS_TABLESPACES
SYS_VIRTUAL SYS_VIRTUAL
SYS_VTQ
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/vtmd_template
test/child test/child
test/parent test/parent
INSERT INTO child VALUES(5,4); INSERT INTO child VALUES(5,4);
@@ -315,8 +317,10 @@ SYS_FOREIGN
SYS_FOREIGN_COLS SYS_FOREIGN_COLS
SYS_TABLESPACES SYS_TABLESPACES
SYS_VIRTUAL SYS_VIRTUAL
SYS_VTQ
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/vtmd_template
test/child test/child
test/parent test/parent
ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT, ALTER TABLE child ADD PRIMARY KEY idx (a3), CHANGE a1 a3 INT,
@@ -340,8 +344,10 @@ SYS_FOREIGN
SYS_FOREIGN_COLS SYS_FOREIGN_COLS
SYS_TABLESPACES SYS_TABLESPACES
SYS_VIRTUAL SYS_VIRTUAL
SYS_VTQ
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/vtmd_template
test/child test/child
test/parent test/parent
SHOW CREATE TABLE child; SHOW CREATE TABLE child;
@@ -376,8 +382,10 @@ SYS_FOREIGN
SYS_FOREIGN_COLS SYS_FOREIGN_COLS
SYS_TABLESPACES SYS_TABLESPACES
SYS_VIRTUAL SYS_VIRTUAL
SYS_VTQ
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/vtmd_template
test/child test/child
test/parent test/parent
SHOW CREATE TABLE child; SHOW CREATE TABLE child;
@@ -412,8 +420,10 @@ SYS_FOREIGN
SYS_FOREIGN_COLS SYS_FOREIGN_COLS
SYS_TABLESPACES SYS_TABLESPACES
SYS_VIRTUAL SYS_VIRTUAL
SYS_VTQ
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/vtmd_template
test/child test/child
test/parent test/parent
SHOW CREATE TABLE child; SHOW CREATE TABLE child;

2
mysql-test/suite/innodb/r/instant_alter_debug.result
View File

@@ -35,7 +35,7 @@ ALTER TABLE t4 ADD COLUMN b INT;
SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
LEFT JOIN t4 ON (NUMERIC_SCALE = pk); LEFT JOIN t4 ON (NUMERIC_SCALE = pk);
COUNT(*) COUNT(*)
1734 1740
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete'; SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL enter WAIT_FOR delete';
ALTER TABLE t4 ADD COLUMN c INT; ALTER TABLE t4 ADD COLUMN c INT;
connect dml,localhost,root,,; connect dml,localhost,root,,;

1
mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
View File

@@ -1,5 +1,4 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_xtradb.inc
select * from information_schema.innodb_trx; select * from information_schema.innodb_trx;
select * from information_schema.innodb_locks; select * from information_schema.innodb_locks;

20
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@@ -5295,27 +5295,27 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE KEEP DEFAULT_VALUE KEEP
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE ENUM 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_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST KEEP,SURVIVE,DROP ENUM_VALUE_LIST KEEP,SURVIVE,DROP
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME VERSIONING_CURRENT_TIMESTAMP VARIABLE_NAME VERSIONING_ASOF_TIMESTAMP
SESSION_VALUE NOW SESSION_VALUE CURRENT
GLOBAL_VALUE NOW GLOBAL_VALUE CURRENT
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE now DEFAULT_VALUE CURRENT
VARIABLE_SCOPE SESSION VARIABLE_SCOPE SESSION
VARIABLE_TYPE VARCHAR 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_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST CURRENT,ALL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT NULL
VARIABLE_NAME VERSIONING_FORCE VARIABLE_NAME VERSIONING_FORCE
SESSION_VALUE OFF SESSION_VALUE OFF
GLOBAL_VALUE OFF GLOBAL_VALUE OFF
@@ -5343,7 +5343,7 @@ NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST AUTO,IMPLICIT,FULL,NEVER ENUM_VALUE_LIST AUTO,IMPLICIT,FULL,NEVER
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME VERSIONING_INNODB_ALGORITHM_SIMPLE VARIABLE_NAME VERSIONING_INNODB_ALGORITHM_SIMPLE
SESSION_VALUE ON SESSION_VALUE ON
GLOBAL_VALUE ON GLOBAL_VALUE ON

6
sql/handler.cc
View File

@@ -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) double handler::keyread_time(uint index, uint ranges, ha_rows rows)
{ {
/* /*

1
sql/handler.h
View File

@@ -4124,7 +4124,6 @@ public:
TABLE_SHARE* get_table_share() { return table_share; } TABLE_SHARE* get_table_share() { return table_share; }
protected: protected:
/* Service methods for use by storage engines. */ /* Service methods for use by storage engines. */
void ha_statistic_increment(ulong SSV::*offset) const;
void **ha_data(THD *) const; void **ha_data(THD *) const;
THD *ha_thd(void) const; THD *ha_thd(void) const;