From 5167b5f0ce57368d99d73e3299e8d891e5fb322a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Dec 2004 12:48:43 +0400 Subject: Bug #6379: ENUM values are incorrectly converted - add_field_to_list() now uses String instead of TYPELIB to be able to distinguish literals 'aaa' and hex literals 0xaabbcc. - move some code from add_field_to_list() where we don't know column charset yet, to mysql_prepare_table(), where we do. --- sql/mysql_priv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/mysql_priv.h') diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 3f55a88b262..3a19a903e00 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -688,7 +688,8 @@ bool add_field_to_list(THD *thd, char *field_name, enum enum_field_types type, uint type_modifier, Item *default_value, Item *on_update_value, LEX_STRING *comment, - char *change, TYPELIB *interval,CHARSET_INFO *cs, + char *change, List *interval_list, + CHARSET_INFO *cs, uint uint_geom_type); void store_position_for_column(const char *name); bool add_to_list(THD *thd, SQL_LIST &list,Item *group,bool asc=0); -- cgit v1.2.1