s/st_ha_create_information/HA_CREATE_INFO/

7 files changed, 3 insertions, 12 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 6241f1ee774..7c8cc98b37c 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1284,7 +1284,7 @@ struct st_partition_iter;
 
 enum ha_choice { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES };
 
-typedef struct st_ha_create_information
+struct HA_CREATE_INFO
 {
   CHARSET_INFO *table_charset, *default_table_charset;
   LEX_STRING connect_string;
@@ -1324,7 +1324,7 @@ typedef struct st_ha_create_information
   ha_table_option_struct *option_struct;           ///< structure with parsed table options
   ha_field_option_struct **fields_option_struct;   ///< array of field option structures
   ha_index_option_struct **indexes_option_struct;  ///< array of index option structures
-} HA_CREATE_INFO;
+};
 
 
 typedef struct st_key_create_information
diff --git a/sql/sql_db.h b/sql/sql_db.h
index 1f447c11a52..62d379c515d 100644
--- a/sql/sql_db.h
+++ b/sql/sql_db.h
@@ -19,7 +19,6 @@
 #include "hash.h"                               /* HASH */
 
 class THD;
-typedef struct st_ha_create_information HA_CREATE_INFO;
 
 int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
 bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create);
diff --git a/sql/sql_partition.h b/sql/sql_partition.h
index 2fd9b4c3d75..8db07f836b0 100644
--- a/sql/sql_partition.h
+++ b/sql/sql_partition.h
@@ -32,7 +32,6 @@ class partition_info;
 struct TABLE;
 struct TABLE_LIST;
 typedef struct st_bitmap MY_BITMAP;
-typedef struct st_ha_create_information HA_CREATE_INFO;
 typedef struct st_key KEY;
 typedef struct st_key_range key_range;
 
diff --git a/sql/sql_show.h b/sql/sql_show.h
index 03d8af3aabd..09e0a80fd4f 100644
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@@ -27,9 +27,7 @@ class String;
 class THD;
 class sp_name;
 struct TABLE_LIST;
-struct st_ha_create_information;
 typedef class st_select_lex SELECT_LEX;
-typedef st_ha_create_information HA_CREATE_INFO;
 struct LEX;
 typedef struct st_mysql_show_var SHOW_VAR;
 typedef struct st_schema_table ST_SCHEMA_TABLE;
diff --git a/sql/sql_table.h b/sql/sql_table.h
index 9d5e768a5a3..7826c540487 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -26,7 +26,7 @@ class THD;
 struct TABLE;
 struct handlerton;
 typedef struct st_ha_check_opt HA_CHECK_OPT;
-typedef struct st_ha_create_information HA_CREATE_INFO;
+struct HA_CREATE_INFO;
 typedef struct st_key KEY;
 typedef struct st_key_cache KEY_CACHE;
 typedef struct st_lock_param_type ALTER_PARTITION_PARAM_TYPE;
diff --git a/sql/unireg.h b/sql/unireg.h
index da510bb4e6d..f4e88b0d8d7 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -23,8 +23,6 @@
 
 /*  Extra functions used by unireg library */
 
-typedef struct st_ha_create_information HA_CREATE_INFO;
-
 #ifndef NO_ALARM_LOOP
 #define NO_ALARM_LOOP		/* lib5 and popen can't use alarm */
 #endif
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h
index 3c0d10fae8c..11871479342 100644
--- a/storage/myisam/ha_myisam.h
+++ b/storage/myisam/ha_myisam.h
@@ -26,9 +26,6 @@
 #include "handler.h"                            /* handler */
 #include "table.h"                              /* TABLE_SHARE */
 
-struct TABLE_SHARE;
-typedef struct st_ha_create_information HA_CREATE_INFO;
-
 #define HA_RECOVER_DEFAULT	1	/* Automatic recover active */
 #define HA_RECOVER_BACKUP	2	/* Make a backupfile on recover */
 #define HA_RECOVER_FORCE	4	/* Recover even if we loose rows */