A post-fix patch for WL#4877/WL#5030:

Fix tons of warnings about mismatch struct and class usage.

15 files changed, 20 insertions, 20 deletions

diff --git a/sql/events.h b/sql/events.h
index c535dda9c31..c84c37b881d 100644
--- a/sql/events.h
+++ b/sql/events.h
@@ -39,7 +39,7 @@ class Event_db_repository;
 class Event_parse_data;
 class Event_queue;
 class Event_scheduler;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 typedef class Item COND;
 typedef struct charset_info_st CHARSET_INFO;
diff --git a/sql/lock.h b/sql/lock.h
index 803bac960b3..19b23f1f42b 100644
--- a/sql/lock.h
+++ b/sql/lock.h
@@ -4,8 +4,8 @@
 #include "thr_lock.h"                           /* thr_lock_type */
 
 // Forward declarations
-class TABLE;
-class TABLE_LIST;
+struct TABLE;
+struct TABLE_LIST;
 class THD;
 typedef struct st_mysql_lock MYSQL_LOCK;
 
@@ -55,7 +55,7 @@ typedef struct st_mysql_lock MYSQL_LOCK;
 
 #include "thr_lock.h"                           /* thr_lock_type */
 
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 struct TABLE;
 typedef struct st_mysql_lock MYSQL_LOCK;
diff --git a/sql/mysqld.h b/sql/mysqld.h
index c57d92733ed..f9d505e6223 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -25,7 +25,7 @@
 #include "sql_list.h"                      /* I_List */
 
 class THD;
-class handlerton;
+struct handlerton;
 class Time_zone;
 
 class scheduler_functions;
diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h
index 27bbccbc009..20f5ce8efc4 100644
--- a/sql/rpl_filter.h
+++ b/sql/rpl_filter.h
@@ -21,7 +21,7 @@
 #include "hash.h"                               /* HASH */
 
 class String;
-class TABLE_LIST;
+struct TABLE_LIST;
 typedef struct st_dynamic_array DYNAMIC_ARRAY;
 
 typedef struct st_table_rule_ent
diff --git a/sql/sp.h b/sql/sp.h
index f44f9f2d382..e16c0718f3f 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -29,7 +29,7 @@ class THD;
 class sp_cache;
 class sp_head;
 class sp_name;
-class st_sp_chistics;
+struct st_sp_chistics;
 struct LEX;
 struct TABLE;
 struct TABLE_LIST;
diff --git a/sql/sql_base.h b/sql/sql_base.h
index eac29b1c257..a57666afe49 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -23,13 +23,13 @@
 #include "mysqld.h"                             /* key_map */
 
 class Item_ident;
-class Name_resolution_context;
+struct Name_resolution_context;
 class Open_table_context;
 class Open_tables_state;
 class Prelocking_strategy;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
-class handlerton;
+struct handlerton;
 struct TABLE;
 
 typedef class st_select_lex SELECT_LEX;
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index 4fbd372d643..792ae6ba960 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -20,7 +20,7 @@
 #include "my_base.h"                            /* ha_rows */
 
 class MY_LOCALE;
-class TABLE_LIST;
+struct TABLE_LIST;
 class Time_zone;
 struct LEX;
 struct TABLE;
diff --git a/sql/sql_delete.h b/sql/sql_delete.h
index cbaa21cef25..d1c1b363abd 100644
--- a/sql/sql_delete.h
+++ b/sql/sql_delete.h
@@ -19,7 +19,7 @@
 #include "my_base.h"                            /* ha_rows */
 
 class THD;
-class TABLE_LIST;
+struct TABLE_LIST;
 class Item;
 
 typedef class Item COND;
diff --git a/sql/sql_derived.h b/sql/sql_derived.h
index 71dd929feca..0d4eddedf22 100644
--- a/sql/sql_derived.h
+++ b/sql/sql_derived.h
@@ -16,7 +16,7 @@
 #ifndef SQL_DERIVED_INCLUDED
 #define SQL_DERIVED_INCLUDED
 
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 struct LEX;
 
diff --git a/sql/sql_handler.h b/sql/sql_handler.h
index d4a528d0bd0..8666d5a8d7b 100644
--- a/sql/sql_handler.h
+++ b/sql/sql_handler.h
@@ -21,7 +21,7 @@
 #include "sql_list.h"                  /* List */
 
 class THD;
-class TABLE_LIST;
+struct TABLE_LIST;
 
 bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen);
 bool mysql_ha_close(THD *thd, TABLE_LIST *tables);
diff --git a/sql/sql_parse.h b/sql/sql_parse.h
index 90a37c7e244..3c34b063d91 100644
--- a/sql/sql_parse.h
+++ b/sql/sql_parse.h
@@ -23,7 +23,7 @@ class Comp_creator;
 class Item;
 class Object_creation_ctx;
 class Parser_state;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 class Table_ident;
 struct LEX;
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index 151dd43c58a..ff16a2da19b 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -17,7 +17,7 @@
 #define _SQL_PROFILE_H
 
 class Item;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 typedef struct st_field_info ST_FIELD_INFO;
 typedef struct st_schema_table ST_SCHEMA_TABLE;
diff --git a/sql/sql_table.h b/sql/sql_table.h
index 6dbfbe3c9b0..3114876f5ed 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -22,7 +22,7 @@
 class Alter_info;
 class Alter_info;
 class Create_field;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 struct TABLE;
 struct handlerton;
diff --git a/sql/sql_update.h b/sql/sql_update.h
index e5a0ca5c627..6bf022a171c 100644
--- a/sql/sql_update.h
+++ b/sql/sql_update.h
@@ -19,7 +19,7 @@
 #include "sql_class.h"                          /* enum_duplicates */
 
 class Item;
-class TABLE_LIST;
+struct TABLE_LIST;
 class THD;
 
 typedef class st_select_lex SELECT_LEX;
diff --git a/sql/table.h b/sql/table.h
index 34d69c585bb..fcff0cfb0d5 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -39,10 +39,10 @@ class st_select_lex;
 class partition_info;
 class COND_EQUAL;
 class Security_context;
-class TABLE_LIST;
+struct TABLE_LIST;
 class ACL_internal_schema_access;
 class ACL_internal_table_access;
-class TABLE_LIST;
+struct TABLE_LIST;
 class Field;
 
 /*