Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0 sql/field.cc: Auto merged
This commit is contained in:
commit
6f8fbe54ad
@ -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->set((char*)"",0);
|
||||
val_ptr->set((const char*)"",0);
|
||||
else
|
||||
val_ptr->set((const char*) typelib->type_names[tmp-1],
|
||||
(uint) strlen(typelib->type_names[tmp-1]));
|
||||
|
Loading…
x
Reference in New Issue
Block a user