summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-12-02 12:48:43 +0400
committerbar@mysql.com <>2004-12-02 12:48:43 +0400
commita09a603d8346afb2be73d1a8f04f00c5fa21de7f (patch)
tree032eccb9c9465fa32dfd86785d466e119d7ee865 /sql/field.h
parent015b6f4136a76b66275314f50af64954e9558874 (diff)
downloadmariadb-git-a09a603d8346afb2be73d1a8f04f00c5fa21de7f.tar.gz
Bug #6379: ENUM values are incorrectly converted
- add_field_to_list() now uses <List>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.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h
index 8887da1dc0f..bb999222381 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1198,6 +1198,7 @@ public:
uint decimals,flags,pack_length;
Field::utype unireg_check;
TYPELIB *interval; // Which interval to use
+ List<String> interval_list;
CHARSET_INFO *charset;
Field::geometry_type geom_type;
Field *field; // For alter table