diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-12-12 22:04:37 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-12-12 22:04:37 -0400 |
| commit | cbc18a76c83365240b0bb684b8b0990ca6d4797d (patch) | |
| tree | cc1590e7d46c44615e22d4b797d5793108534f99 /sql | |
| parent | 8c7f319fe3f1e776e0b0bcaae7ee6ff166d6efd5 (diff) | |
| parent | 5bbc3afd6b3f7adca5d622a95556422dbc1d3fea (diff) | |
| download | mariadb-git-cbc18a76c83365240b0bb684b8b0990ca6d4797d.tar.gz | |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index d43089ec35c..43244a2f8a6 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4623,7 +4623,7 @@ void Field_enum::store(const char *from,uint length) uint tmp=find_enum(typelib,from,length); if (!tmp) { - if (length < 6) // Can't be more than 99999 enums + if (length < 6) // Can't be more than 99999 enums { /* This is for reading numbers with LOAD DATA INFILE */ char buff[7], *end; @@ -4721,7 +4721,7 @@ String *Field_enum::val_str(String *val_buffer __attribute__((unused)), { uint tmp=(uint) Field_enum::val_int(); if (!tmp || tmp > typelib->count) - val_ptr->length(0); + val_ptr->set((char*)"",0); else val_ptr->set((const char*) typelib->type_names[tmp-1], (uint) strlen(typelib->type_names[tmp-1])); |