Merge branch '10.1' into 10.2

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/table.h b/sql/table.h
index c2c523181a0..6552a8e13da 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -480,6 +480,16 @@ public:
 };
 
 
+/*
+  If the table isn't valid, report the error to the server log only.
+*/
+class Table_check_intact_log_error : public Table_check_intact
+{
+protected:
+  void report_error(uint, const char *fmt, ...);
+};
+
+
 /**
   Class representing the fact that some thread waits for table
   share to be flushed. Is used to represent information about