diff options
Diffstat (limited to 'storage/perfschema/table_replication_group_member_stats.cc')
| -rw-r--r-- | storage/perfschema/table_replication_group_member_stats.cc | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/storage/perfschema/table_replication_group_member_stats.cc b/storage/perfschema/table_replication_group_member_stats.cc index 91a7ff0a974..9c7f61817d1 100644 --- a/storage/perfschema/table_replication_group_member_stats.cc +++ b/storage/perfschema/table_replication_group_member_stats.cc @@ -1,14 +1,21 @@ /* - Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + it under the terms of the GNU General Public License, version 2.0, + as published by the Free Software Foundation. + + This program is also distributed with certain software (including + but not limited to OpenSSL) that is licensed under separate terms, + as designated in a particular file or component or in included license + documentation. The authors of MySQL hereby grant you an additional + permission to link the program and your derivative works with the + separately licensed software that they have included with MySQL. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU General Public License, version 2.0, for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software @@ -117,12 +124,12 @@ static void set_transactions_conflicts_detected(void* const context, row->trx_conflicts= value; } -static void set_transactions_in_validation(void* const context, - unsigned long long int value) +static void set_transactions_rows_in_validation(void* const context, + unsigned long long int value) { struct st_row_group_member_stats* row= static_cast<struct st_row_group_member_stats*>(context); - row->trx_validating= value; + row->trx_rows_validating= value; } @@ -161,7 +168,7 @@ static const TABLE_FIELD_TYPE field_types[]= {NULL, 0} }, { - {C_STRING_WITH_LEN("COUNT_TRANSACTIONS_VALIDATING")}, + {C_STRING_WITH_LEN("COUNT_TRANSACTIONS_ROWS_VALIDATING")}, {C_STRING_WITH_LEN("bigint")}, {NULL, 0} }, @@ -275,7 +282,7 @@ void table_replication_group_member_stats::make_row() m_row.trx_in_queue= 0; m_row.trx_checked= 0; m_row.trx_conflicts= 0; - m_row.trx_validating= 0; + m_row.trx_rows_validating= 0; // Set callbacks on GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS. const GROUP_REPLICATION_GROUP_MEMBER_STATS_CALLBACKS callbacks= @@ -289,7 +296,7 @@ void table_replication_group_member_stats::make_row() &set_transactions_in_queue, &set_transactions_certified, &set_transactions_conflicts_detected, - &set_transactions_in_validation, + &set_transactions_rows_in_validation, }; // Query plugin and let callbacks do their job. @@ -345,7 +352,7 @@ int table_replication_group_member_stats::read_row_values(TABLE *table, set_field_ulonglong(f, m_row.trx_conflicts); break; case 6: /** certification_db_size */ - set_field_ulonglong(f, m_row.trx_validating); + set_field_ulonglong(f, m_row.trx_rows_validating); break; case 7: /** stable_set */ set_field_longtext_utf8(f, m_row.trx_committed, |