mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove INFORMATION_SCHEMA.INNODB_TRX.trx_adaptive_hash_latched

Browse source 
In MariaDB 10.2, this column is practically always reported as 0,
even before the data field trx_t::has_search_latch was removed.
This commit is contained in:
Marko Mäkelä 2017-06-20 09:39:13 +03:00
parent 813e6e628f
commit 99e017d099
3 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/innodb/r/innodb_information_schema.result
View file

@ -42,7 +42,6 @@ trx_isolation_level varchar(16) NO
trx_unique_checks int(1) NO 0 trx_unique_checks int(1) NO 0
trx_foreign_key_checks int(1) NO 0 trx_foreign_key_checks int(1) NO 0
trx_last_foreign_key_error varchar(256) YES NULL trx_last_foreign_key_error varchar(256) YES NULL
trx_adaptive_hash_latched int(1) NO 0
trx_is_read_only int(1) NO 0 trx_is_read_only int(1) NO 0
trx_autocommit_non_locking int(1) NO 0 trx_autocommit_non_locking int(1) NO 0
trx_state trx_weight trx_tables_in_use trx_tables_locked trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_state trx_weight trx_tables_in_use trx_tables_locked trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks

2
mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
View file

@ -1,5 +1,5 @@
select * from information_schema.innodb_trx; select * from information_schema.innodb_trx;
trx_id trx_state trx_started trx_requested_lock_id trx_wait_started trx_weight trx_mysql_thread_id trx_query trx_operation_state trx_tables_in_use trx_tables_locked trx_lock_structs trx_lock_memory_bytes trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_last_foreign_key_error trx_adaptive_hash_latched trx_is_read_only trx_autocommit_non_locking trx_id trx_state trx_started trx_requested_lock_id trx_wait_started trx_weight trx_mysql_thread_id trx_query trx_operation_state trx_tables_in_use trx_tables_locked trx_lock_structs trx_lock_memory_bytes trx_rows_locked trx_rows_modified trx_concurrency_tickets trx_isolation_level trx_unique_checks trx_foreign_key_checks trx_last_foreign_key_error trx_is_read_only trx_autocommit_non_locking
Warnings: Warnings:
Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_trx but the InnoDB storage engine is not installed Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_trx but the InnoDB storage engine is not installed
select * from information_schema.innodb_locks; select * from information_schema.innodb_locks;

20
storage/innobase/handler/i_s.cc
View file

@ -530,18 +530,7 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(old_name, ""), STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#ifdef BTR_CUR_HASH_ADAPT #define IDX_TRX_READ_ONLY 20
#define IDX_TRX_ADAPTIVE_HASH_LATCHED 20
{STRUCT_FLD(field_name, "trx_adaptive_hash_latched"),
STRUCT_FLD(field_length, 1),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, 0),
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#endif /* BTR_CUR_HASH_ADAPT */
#define IDX_TRX_READ_ONLY 20 + I_S_AHI
{STRUCT_FLD(field_name, "trx_is_read_only"), {STRUCT_FLD(field_name, "trx_is_read_only"),
STRUCT_FLD(field_length, 1), STRUCT_FLD(field_length, 1),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
@ -550,7 +539,7 @@ static ST_FIELD_INFO innodb_trx_fields_info[] =
STRUCT_FLD(old_name, ""), STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define IDX_TRX_AUTOCOMMIT_NON_LOCKING 21 + I_S_AHI #define IDX_TRX_AUTOCOMMIT_NON_LOCKING 21
{STRUCT_FLD(field_name, "trx_autocommit_non_locking"), {STRUCT_FLD(field_name, "trx_autocommit_non_locking"),
STRUCT_FLD(field_length, 1), STRUCT_FLD(field_length, 1),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG), STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
@ -697,11 +686,6 @@ fill_innodb_trx_from_cache(
OK(field_store_string(fields[IDX_TRX_LAST_FOREIGN_KEY_ERROR], OK(field_store_string(fields[IDX_TRX_LAST_FOREIGN_KEY_ERROR],
row->trx_foreign_key_error)); row->trx_foreign_key_error));
#ifdef BTR_CUR_HASH_ADAPT
/* trx_adaptive_hash_latched */
OK(fields[IDX_TRX_ADAPTIVE_HASH_LATCHED]->store(0, true));
#endif /* BTR_CUR_HASH_ADAPT */
/* trx_is_read_only*/ /* trx_is_read_only*/
OK(fields[IDX_TRX_READ_ONLY]->store( OK(fields[IDX_TRX_READ_ONLY]->store(
row->trx_is_read_only, true)); row->trx_is_read_only, true));