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

s/st_ha_create_information/HA_CREATE_INFO/

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-07 15:35:39 +02:00
parent e727741614
commit ccc9238335
7 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.h
View File

@ -1284,7 +1284,7 @@ struct st_partition_iter;
enum ha_choice { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES }; 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; CHARSET_INFO *table_charset, *default_table_charset;
LEX_STRING connect_string; 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_table_option_struct *option_struct; ///< structure with parsed table options
ha_field_option_struct **fields_option_struct; ///< array of field option structures 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_index_option_struct **indexes_option_struct; ///< array of index option structures
} HA_CREATE_INFO; };
typedef struct st_key_create_information typedef struct st_key_create_information

1
sql/sql_db.h
View File

@ -19,7 +19,6 @@
#include "hash.h" /* HASH */ #include "hash.h" /* HASH */
class THD; 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); 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); bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create);

1
sql/sql_partition.h
View File

@ -32,7 +32,6 @@ class partition_info;
struct TABLE; struct TABLE;
struct TABLE_LIST; struct TABLE_LIST;
typedef struct st_bitmap MY_BITMAP; typedef struct st_bitmap MY_BITMAP;
typedef struct st_ha_create_information HA_CREATE_INFO;
typedef struct st_key KEY; typedef struct st_key KEY;
typedef struct st_key_range key_range; typedef struct st_key_range key_range;

2
sql/sql_show.h
View File

@ -27,9 +27,7 @@ class String;
class THD; class THD;
class sp_name; class sp_name;
struct TABLE_LIST; struct TABLE_LIST;
struct st_ha_create_information;
typedef class st_select_lex SELECT_LEX; typedef class st_select_lex SELECT_LEX;
typedef st_ha_create_information HA_CREATE_INFO;
struct LEX; struct LEX;
typedef struct st_mysql_show_var SHOW_VAR; typedef struct st_mysql_show_var SHOW_VAR;
typedef struct st_schema_table ST_SCHEMA_TABLE; typedef struct st_schema_table ST_SCHEMA_TABLE;

2
sql/sql_table.h
View File

@ -26,7 +26,7 @@ class THD;
struct TABLE; struct TABLE;
struct handlerton; struct handlerton;
typedef struct st_ha_check_opt HA_CHECK_OPT; 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 KEY;
typedef struct st_key_cache KEY_CACHE; typedef struct st_key_cache KEY_CACHE;
typedef struct st_lock_param_type ALTER_PARTITION_PARAM_TYPE; typedef struct st_lock_param_type ALTER_PARTITION_PARAM_TYPE;

2
sql/unireg.h
View File

@ -23,8 +23,6 @@
/* Extra functions used by unireg library */ /* Extra functions used by unireg library */
typedef struct st_ha_create_information HA_CREATE_INFO;
#ifndef NO_ALARM_LOOP #ifndef NO_ALARM_LOOP
#define NO_ALARM_LOOP /* lib5 and popen can't use alarm */ #define NO_ALARM_LOOP /* lib5 and popen can't use alarm */
#endif #endif

3
storage/myisam/ha_myisam.h
View File

@ -26,9 +26,6 @@
#include "handler.h" /* handler */ #include "handler.h" /* handler */
#include "table.h" /* TABLE_SHARE */ #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_DEFAULT 1 /* Automatic recover active */
#define HA_RECOVER_BACKUP 2 /* Make a backupfile on recover */ #define HA_RECOVER_BACKUP 2 /* Make a backupfile on recover */
#define HA_RECOVER_FORCE 4 /* Recover even if we loose rows */ #define HA_RECOVER_FORCE 4 /* Recover even if we loose rows */