diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-12-17 13:15:57 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-12-17 13:15:57 -0400 |
| commit | 6f8fbe54adefbf95924f28496e00f897ebbe4e80 (patch) | |
| tree | c03830435c2df0f0a5985f7e6b058520d0d0d1a4 /sql/field.cc | |
| parent | a8e8a24990c4b4500eb34417f7b5e4115d288af2 (diff) | |
| parent | b8286832fbbe6de2f704195a6a31c5efb0fe70e8 (diff) | |
| download | mariadb-git-6f8fbe54adefbf95924f28496e00f897ebbe4e80.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
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -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])); |