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

merge

Browse Source
This commit is contained in:
Mattias Jonsson 2009-08-12 18:53:33 +02:00
commit 89260b24c9
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.h
View File

@ -895,7 +895,7 @@ class partition_info;
struct st_partition_iter; struct st_partition_iter;
#define NOT_A_PARTITION_ID ((uint32)-1) #define NOT_A_PARTITION_ID ((uint32)-1)
enum ha_choice { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES }; enum enum_ha_unused { HA_CHOICE_UNDEF, HA_CHOICE_NO, HA_CHOICE_YES };
typedef struct st_ha_create_information typedef struct st_ha_create_information
{ {
@ -918,14 +918,12 @@ typedef struct st_ha_create_information
uint options; /* OR of HA_CREATE_ options */ uint options; /* OR of HA_CREATE_ options */
uint merge_insert_method; uint merge_insert_method;
uint extra_size; /* length of extra data segment */ uint extra_size; /* length of extra data segment */
/** Transactional or not. Unused; reserved for future versions. */ enum enum_ha_unused unused1;
enum ha_choice transactional;
bool table_existed; /* 1 in create if table existed */ bool table_existed; /* 1 in create if table existed */
bool frm_only; /* 1 if no ha_create_table() */ bool frm_only; /* 1 if no ha_create_table() */
bool varchar; /* 1 if table has a VARCHAR */ bool varchar; /* 1 if table has a VARCHAR */
enum ha_storage_media storage_media; /* DEFAULT, DISK or MEMORY */ enum ha_storage_media storage_media; /* DEFAULT, DISK or MEMORY */
/** Per-page checksums or not. Unused; reserved for future versions. */ enum enum_ha_unused unused2;
enum ha_choice page_checksum;
} HA_CREATE_INFO; } HA_CREATE_INFO;

8
sql/sql_yacc.yy
View File

@ -494,7 +494,6 @@ Item* handle_sql2003_note184_exception(THD *thd, Item* left, bool equal,
enum enum_tx_isolation tx_isolation; enum enum_tx_isolation tx_isolation;
enum Cast_target cast_type; enum Cast_target cast_type;
enum Item_udftype udf_type; enum Item_udftype udf_type;
enum ha_choice choice;
CHARSET_INFO *charset; CHARSET_INFO *charset;
thr_lock_type lock_type; thr_lock_type lock_type;
interval_type interval, interval_time_st; interval_type interval, interval_time_st;
@ -1164,8 +1163,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%type <ulonglong_number> %type <ulonglong_number>
ulonglong_num real_ulonglong_num size_number ulonglong_num real_ulonglong_num size_number
%type <choice> choice
%type <p_elem_value> %type <p_elem_value>
part_bit_expr part_bit_expr
@ -9066,11 +9063,6 @@ dec_num:
| FLOAT_NUM | FLOAT_NUM
; ;
choice:
ulong_num { $$= $1 != 0 ? HA_CHOICE_YES : HA_CHOICE_NO; }
| DEFAULT { $$= HA_CHOICE_UNDEF; }
;
procedure_clause: procedure_clause:
/* empty */ /* empty */
| PROCEDURE ident /* Procedure name */ | PROCEDURE ident /* Procedure name */

6
sql/table.h
View File

@ -361,10 +361,8 @@ typedef struct st_table_share
} }
enum row_type row_type; /* How rows are stored */ enum row_type row_type; /* How rows are stored */
enum tmp_table_type tmp_table; enum tmp_table_type tmp_table;
/** Transactional or not. Unused; reserved for future versions. */ enum enum_ha_unused unused1;
enum ha_choice transactional; enum enum_ha_unused unused2;
/** Per-page checksums or not. Unused; reserved for future versions. */
enum ha_choice page_checksum;
uint ref_count; /* How many TABLE objects uses this */ uint ref_count; /* How many TABLE objects uses this */
uint open_count; /* Number of tables in open list */ uint open_count; /* Number of tables in open list */