1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix tons of warnings about mismatch struct and class usage.
This commit is contained in:
Alexander Nozdrin 2010-04-12 17:17:37 +04:00
parent 7decb1b928
commit 50ff451566
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/events.h
View File

@ -39,7 +39,7 @@ class Event_db_repository;
class Event_parse_data; class Event_parse_data;
class Event_queue; class Event_queue;
class Event_scheduler; class Event_scheduler;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
typedef class Item COND; typedef class Item COND;
typedef struct charset_info_st CHARSET_INFO; typedef struct charset_info_st CHARSET_INFO;

6
sql/lock.h
View File

@ -4,8 +4,8 @@
#include "thr_lock.h" /* thr_lock_type */ #include "thr_lock.h" /* thr_lock_type */
// Forward declarations // Forward declarations
class TABLE; struct TABLE;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
typedef struct st_mysql_lock MYSQL_LOCK; 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 */ #include "thr_lock.h" /* thr_lock_type */
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
struct TABLE; struct TABLE;
typedef struct st_mysql_lock MYSQL_LOCK; typedef struct st_mysql_lock MYSQL_LOCK;

2
sql/mysqld.h
View File

@ -25,7 +25,7 @@
#include "sql_list.h" /* I_List */ #include "sql_list.h" /* I_List */
class THD; class THD;
class handlerton; struct handlerton;
class Time_zone; class Time_zone;
class scheduler_functions; class scheduler_functions;

2
sql/rpl_filter.h
View File

@ -21,7 +21,7 @@
#include "hash.h" /* HASH */ #include "hash.h" /* HASH */
class String; class String;
class TABLE_LIST; struct TABLE_LIST;
typedef struct st_dynamic_array DYNAMIC_ARRAY; typedef struct st_dynamic_array DYNAMIC_ARRAY;
typedef struct st_table_rule_ent typedef struct st_table_rule_ent

2
sql/sp.h
View File

@ -29,7 +29,7 @@ class THD;
class sp_cache; class sp_cache;
class sp_head; class sp_head;
class sp_name; class sp_name;
class st_sp_chistics; struct st_sp_chistics;
struct LEX; struct LEX;
struct TABLE; struct TABLE;
struct TABLE_LIST; struct TABLE_LIST;

6
sql/sql_base.h
View File

@ -23,13 +23,13 @@
#include "mysqld.h" /* key_map */ #include "mysqld.h" /* key_map */
class Item_ident; class Item_ident;
class Name_resolution_context; struct Name_resolution_context;
class Open_table_context; class Open_table_context;
class Open_tables_state; class Open_tables_state;
class Prelocking_strategy; class Prelocking_strategy;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
class handlerton; struct handlerton;
struct TABLE; struct TABLE;
typedef class st_select_lex SELECT_LEX; typedef class st_select_lex SELECT_LEX;

2
sql/sql_cache.h
View File

@ -20,7 +20,7 @@
#include "my_base.h" /* ha_rows */ #include "my_base.h" /* ha_rows */
class MY_LOCALE; class MY_LOCALE;
class TABLE_LIST; struct TABLE_LIST;
class Time_zone; class Time_zone;
struct LEX; struct LEX;
struct TABLE; struct TABLE;

2
sql/sql_delete.h
View File

@ -19,7 +19,7 @@
#include "my_base.h" /* ha_rows */ #include "my_base.h" /* ha_rows */
class THD; class THD;
class TABLE_LIST; struct TABLE_LIST;
class Item; class Item;
typedef class Item COND; typedef class Item COND;

2
sql/sql_derived.h
View File

@ -16,7 +16,7 @@
#ifndef SQL_DERIVED_INCLUDED #ifndef SQL_DERIVED_INCLUDED
#define SQL_DERIVED_INCLUDED #define SQL_DERIVED_INCLUDED
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
struct LEX; struct LEX;

2
sql/sql_handler.h
View File

@ -21,7 +21,7 @@
#include "sql_list.h" /* List */ #include "sql_list.h" /* List */
class THD; class THD;
class TABLE_LIST; struct TABLE_LIST;
bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen); bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen);
bool mysql_ha_close(THD *thd, TABLE_LIST *tables); bool mysql_ha_close(THD *thd, TABLE_LIST *tables);

2
sql/sql_parse.h
View File

@ -23,7 +23,7 @@ class Comp_creator;
class Item; class Item;
class Object_creation_ctx; class Object_creation_ctx;
class Parser_state; class Parser_state;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
class Table_ident; class Table_ident;
struct LEX; struct LEX;

2
sql/sql_profile.h
View File

@ -17,7 +17,7 @@
#define _SQL_PROFILE_H #define _SQL_PROFILE_H
class Item; class Item;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
typedef struct st_field_info ST_FIELD_INFO; typedef struct st_field_info ST_FIELD_INFO;
typedef struct st_schema_table ST_SCHEMA_TABLE; typedef struct st_schema_table ST_SCHEMA_TABLE;

2
sql/sql_table.h
View File

@ -22,7 +22,7 @@
class Alter_info; class Alter_info;
class Alter_info; class Alter_info;
class Create_field; class Create_field;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
struct TABLE; struct TABLE;
struct handlerton; struct handlerton;

2
sql/sql_update.h
View File

@ -19,7 +19,7 @@
#include "sql_class.h" /* enum_duplicates */ #include "sql_class.h" /* enum_duplicates */
class Item; class Item;
class TABLE_LIST; struct TABLE_LIST;
class THD; class THD;
typedef class st_select_lex SELECT_LEX; typedef class st_select_lex SELECT_LEX;

4
sql/table.h
View File

@ -39,10 +39,10 @@ class st_select_lex;
class partition_info; class partition_info;
class COND_EQUAL; class COND_EQUAL;
class Security_context; class Security_context;
class TABLE_LIST; struct TABLE_LIST;
class ACL_internal_schema_access; class ACL_internal_schema_access;
class ACL_internal_table_access; class ACL_internal_table_access;
class TABLE_LIST; struct TABLE_LIST;
class Field; class Field;
/* /*