diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-03-31 10:47:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-03-31 10:47:32 +0200 |
| commit | 6ae390fd5d91ba83ba2f22a3cbaeca621a63c80b (patch) | |
| tree | 7f5826b927d2057a7dbf435cca05e3c2b3faea97 /sql/item.h | |
| parent | e5cddec6c5bca4c6cbd20c0be988186e3b2dbc94 (diff) | |
| parent | 3d03f0ae1b20c124f4ab972741a751343f3e7c52 (diff) | |
| download | mariadb-git-6ae390fd5d91ba83ba2f22a3cbaeca621a63c80b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.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 f44b4bed98d..d949095b455 100644 --- a/sql/item.h +++ b/sql/item.h @@ -559,6 +559,7 @@ public: bool get_time(TIME *tm); bool get_date(TIME *tm, uint fuzzydate); int save_in_field(Field *field, bool no_conversions); + bool fix_fields(THD *, struct st_table_list *, Item **); void set_null(); void set_int(longlong i, uint32 max_length_arg); |