database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge chilla.local:/home/mydev/mysql-5.0-bug16218

Browse Source 
into  chilla.local:/home/mydev/mysql-5.1-ateam


sql/field.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/field.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/table.cc:
  Manual merge
This commit is contained in:
unknown
2006-07-06 16:09:50 +02:00
parent 9532056d13 ab5ebc0fb7
commit a085d0988e
5 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/field.h
View File

@@ -219,7 +219,8 @@ public:
*/
virtual bool can_be_compared_as_longlong() const { return FALSE; }
virtual void free() {}
virtual Field *new_field(MEM_ROOT *root, struct st_table *new_table);
virtual Field *new_field(MEM_ROOT *root, struct st_table *new_table,
bool keep_type);
virtual Field *new_key_field(MEM_ROOT *root, struct st_table *new_table,
char *new_ptr, uchar *new_null_ptr,
uint new_null_bit);
@@ -1044,7 +1045,7 @@ public:
enum_field_types real_type() const { return FIELD_TYPE_STRING; }
bool has_charset(void) const
{ return charset() == &my_charset_bin ? FALSE : TRUE; }
Field *new_field(MEM_ROOT *root, struct st_table *new_table);
Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
};
@@ -1117,7 +1118,7 @@ public:
enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; }
bool has_charset(void) const
{ return charset() == &my_charset_bin ? FALSE : TRUE; }
Field *new_field(MEM_ROOT *root, struct st_table *new_table);
Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
Field *new_key_field(MEM_ROOT *root, struct st_table *new_table,
char *new_ptr, uchar *new_null_ptr,
uint new_null_bit);