diff options
| author | vva@eagle.mysql.r18.ru <> | 2003-12-17 13:15:57 -0400 |
|---|---|---|
| committer | vva@eagle.mysql.r18.ru <> | 2003-12-17 13:15:57 -0400 |
| commit | 07f520b73e1f0f436630158acfcc5f5f12969424 (patch) | |
| tree | c03830435c2df0f0a5985f7e6b058520d0d0d1a4 | |
| parent | c24fd8393963404848264c19be4973e2ac888b4c (diff) | |
| parent | 7aad55d97dabef3c35b3028ffc96cca5254d563c (diff) | |
| download | mariadb-git-07f520b73e1f0f436630158acfcc5f5f12969424.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
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index feab607400c..fd0bea83a05 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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])); |