1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0


sql/field.cc:
  Auto merged
This commit is contained in:
unknown 2003-12-17 13:15:57 -04:00
commit 6f8fbe54ad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -4721,7 +4721,7 @@ String *Field_enum::val_str(String *val_buffer __attribute__((unused)),
{ {
uint tmp=(uint) Field_enum::val_int(); uint tmp=(uint) Field_enum::val_int();
if (!tmp || tmp > typelib->count) if (!tmp || tmp > typelib->count)
val_ptr->set((char*)"",0); val_ptr->set((const char*)"",0);
else else
val_ptr->set((const char*) typelib->type_names[tmp-1], val_ptr->set((const char*) typelib->type_names[tmp-1],
(uint) strlen(typelib->type_names[tmp-1])); (uint) strlen(typelib->type_names[tmp-1]));