mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Backport of:
---------------------------------------------------------- revno: 2630.22.8 committer: Konstantin Osipov <konstantin@mysql.com> branch nick: mysql-6.0-runtime timestamp: Sun 2008-08-10 18:49:52 +0400 message: Get rid of typedef struct for the most commonly used types: TABLE, TABLE_SHARE, LEX. This simplifies use of tags and forward declarations.
This commit is contained in:
16
sql/field.cc
16
sql/field.cc
@ -1799,7 +1799,7 @@ bool Field::optimize_range(uint idx, uint part)
|
||||
}
|
||||
|
||||
|
||||
Field *Field::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
Field *Field::new_field(MEM_ROOT *root, TABLE *new_table,
|
||||
bool keep_type __attribute__((unused)))
|
||||
{
|
||||
Field *tmp;
|
||||
@ -1820,7 +1820,7 @@ Field *Field::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
}
|
||||
|
||||
|
||||
Field *Field::new_key_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
Field *Field::new_key_field(MEM_ROOT *root, TABLE *new_table,
|
||||
uchar *new_ptr, uchar *new_null_ptr,
|
||||
uint new_null_bit)
|
||||
{
|
||||
@ -1837,7 +1837,7 @@ Field *Field::new_key_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
|
||||
/* This is used to generate a field in TABLE from TABLE_SHARE */
|
||||
|
||||
Field *Field::clone(MEM_ROOT *root, struct st_table *new_table)
|
||||
Field *Field::clone(MEM_ROOT *root, TABLE *new_table)
|
||||
{
|
||||
Field *tmp;
|
||||
if ((tmp= (Field*) memdup_root(root,(char*) this,size_of())))
|
||||
@ -7003,7 +7003,7 @@ uint Field_string::get_key_image(uchar *buff, uint length, imagetype type_arg)
|
||||
}
|
||||
|
||||
|
||||
Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
Field *Field_string::new_field(MEM_ROOT *root, TABLE *new_table,
|
||||
bool keep_type)
|
||||
{
|
||||
Field *field;
|
||||
@ -7581,7 +7581,7 @@ int Field_varstring::cmp_binary(const uchar *a_ptr, const uchar *b_ptr,
|
||||
}
|
||||
|
||||
|
||||
Field *Field_varstring::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
Field *Field_varstring::new_field(MEM_ROOT *root, TABLE *new_table,
|
||||
bool keep_type)
|
||||
{
|
||||
Field_varstring *res= (Field_varstring*) Field::new_field(root, new_table,
|
||||
@ -7593,7 +7593,7 @@ Field *Field_varstring::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
|
||||
|
||||
Field *Field_varstring::new_key_field(MEM_ROOT *root,
|
||||
struct st_table *new_table,
|
||||
TABLE *new_table,
|
||||
uchar *new_ptr, uchar *new_null_ptr,
|
||||
uint new_null_bit)
|
||||
{
|
||||
@ -8723,7 +8723,7 @@ void Field_enum::sql_type(String &res) const
|
||||
}
|
||||
|
||||
|
||||
Field *Field_enum::new_field(MEM_ROOT *root, struct st_table *new_table,
|
||||
Field *Field_enum::new_field(MEM_ROOT *root, TABLE *new_table,
|
||||
bool keep_type)
|
||||
{
|
||||
Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
|
||||
@ -9021,7 +9021,7 @@ Field_bit::do_last_null_byte() const
|
||||
|
||||
|
||||
Field *Field_bit::new_key_field(MEM_ROOT *root,
|
||||
struct st_table *new_table,
|
||||
TABLE *new_table,
|
||||
uchar *new_ptr, uchar *new_null_ptr,
|
||||
uint new_null_bit)
|
||||
{
|
||||
|
Reference in New Issue
Block a user