summaryrefslogtreecommitdiff
path: root/sql/rpl_gtid.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-12-09 17:13:43 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-12-09 17:13:43 +0400
commit83f7151da5259fa07ab2c26600009d53adef50f3 (patch)
tree39c8f971be55aabd9e294a534fd8b6f448374af9 /sql/rpl_gtid.cc
parent870d7589c6c4596b0f1a641add5071469e2c94a7 (diff)
downloadmariadb-git-83f7151da5259fa07ab2c26600009d53adef50f3.tar.gz
MDEV-10435 crash with bad stat tables.
Functions from sql/statistics.cc don't seem to expect stat tables to fail or to have inadequate structure. Table open errors suppressed and some validity checks added. Invalid tables reported to the server log.
Diffstat (limited to 'sql/rpl_gtid.cc')
-rw-r--r--sql/rpl_gtid.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index f54ef2b0081..dfec97bf021 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.cc
@@ -448,19 +448,7 @@ static const TABLE_FIELD_DEF mysql_gtid_slave_pos_tabledef= {
mysql_rpl_slave_state_pk_parts
};
-class Gtid_db_intact : public Table_check_intact
-{
-protected:
- void report_error(uint, const char *fmt, ...)
- {
- va_list args;
- va_start(args, fmt);
- error_log_print(ERROR_LEVEL, fmt, args);
- va_end(args);
- }
-};
-
-static Gtid_db_intact gtid_table_intact;
+static Table_check_intact_log_error gtid_table_intact;
/*
Check that the mysql.gtid_slave_pos table has the correct definition.