diff options
| author | unknown <jani/jamppa@production.mysql.com> | 2006-09-25 08:10:58 +0200 |
|---|---|---|
| committer | unknown <jani/jamppa@production.mysql.com> | 2006-09-25 08:10:58 +0200 |
| commit | af3f646c2972e07deba3390efa4ed6ca5a239f9f (patch) | |
| tree | 03966d95a898f33cb199516a8bbdf0e50ed228b8 /sql/item.h | |
| parent | 224e0b5f588e1c4ab51f528e570846e0c16a43ff (diff) | |
| parent | 6db41716915cdf45d92a023c17343c9554f61d47 (diff) | |
| download | mariadb-git-af3f646c2972e07deba3390efa4ed6ca5a239f9f.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index af075c34869..3dd7d3d220e 100644 --- a/sql/item.h +++ b/sql/item.h @@ -548,6 +548,7 @@ public: virtual bool eq(const Item *, bool binary_cmp) const; virtual Item_result result_type() const { return REAL_RESULT; } virtual Item_result cast_to_int_type() const { return result_type(); } + virtual enum_field_types string_field_type() const; virtual enum_field_types field_type() const; virtual enum Type type() const =0; |