Auto-merge from mysql-trunk.

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;

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;

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;
@@ -184,7 +184,7 @@ extern ulong server_id, concurrency;
 extern time_t server_start_time, flush_status_time;
 extern char *opt_mysql_tmpdir, mysql_charsets_dir[];
 extern int mysql_unpacked_real_data_home_len;
-extern MY_TMPDIR mysql_tmpdir_list;
+extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list;
 extern const char *first_keyword, *delayed_user, *binary_keyword;
 extern MYSQL_PLUGIN_IMPORT const char  *my_localhost;
 extern MYSQL_PLUGIN_IMPORT const char **errmesg;			/* Error messages */

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

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;

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;

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;

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;

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;
 

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);

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;

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;

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;

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;

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;
 
 /*

storage/perfschema/unittest/pfs_timer-t.cc

@@ -13,7 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <mysql_priv.h>
+#include <sql_priv.h>
 #include <my_global.h>
 #include <pfs_timer.h>
 #include "my_sys.h"