diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-10-24 13:21:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-10-24 13:21:32 +0400 |
| commit | c86fa2b243ea93fb6b224be0b4d205868fd3c59f (patch) | |
| tree | aeb384da78f8c6c7c36b7bb2d304bf5fa5f98199 /sql/item.h | |
| parent | 442ec56c11cae6cb5f0da0810ac5463a047d92e3 (diff) | |
| parent | 324f3e6a0fa6c162f1861cae000ff325fbba2b22 (diff) | |
| download | mariadb-git-c86fa2b243ea93fb6b224be0b4d205868fd3c59f.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 3fa0f4bb50b..223a519fa33 100644 --- a/sql/item.h +++ b/sql/item.h @@ -592,7 +592,7 @@ public: void init_make_field(Send_field *tmp_field,enum enum_field_types type); virtual void cleanup(); virtual void make_field(Send_field *field); - Field *make_string_field(TABLE *table); + virtual Field *make_string_field(TABLE *table); virtual bool fix_fields(THD *, Item **); /* should be used in case where we are sure that we do not need |