database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
This commit is contained in:
cmiller@zippy.cornsilk.net
2007-01-07 09:31:49 -05:00
parent 05d05c776f 1942fd0a49
commit a16eaf3301
80 changed files with 1229 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/field.cc
View File

@ -8030,6 +8030,16 @@ void Field_enum::sql_type(String &res) const
}
Field *Field_enum::new_field(MEM_ROOT *root, struct st_table *new_table,
bool keep_type)
{
Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
if (res)
res->typelib= copy_typelib(root, typelib);
return res;
}
/*
set type.
This is a string which can have a collection of different values.