diff options
| author | unknown <kaa@polly.local> | 2006-12-14 21:24:52 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-12-14 21:24:52 +0300 |
| commit | db1a2d2d802320a6c40a4f468651895c5ea369da (patch) | |
| tree | 2c7af9c9d9f27b2eadc1547ead8f6d2b476eddb9 /sql/field.h | |
| parent | 931dcc8a8328698397e7bd194eb1a7041e0d1970 (diff) | |
| parent | 5b71281467c85dc705da30f0fe4ebc094f0ff983 (diff) | |
| download | mariadb-git-db1a2d2d802320a6c40a4f468651895c5ea369da.tar.gz | |
Merge polly.local:/tmp/maint/bug24117/my50-bug24117
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
mysys/typelib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/field.h b/sql/field.h index 709630218b2..b79e8fc0d13 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1285,6 +1285,7 @@ public: { flags|=ENUM_FLAG; } + Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type); enum_field_types type() const { return FIELD_TYPE_STRING; } enum Item_result cmp_type () const { return INT_RESULT; } enum Item_result cast_to_int_type () const { return INT_RESULT; } |