diff options
| author | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
| commit | 3c82f72091d2c21519540ee5bcc3b2acadfbf198 (patch) | |
| tree | 8d29892167ff9d836d0992c219bf4307f1c03b75 /sql/item_cmpfunc.h | |
| parent | 428830c50024475e85e12f6b188879c2de536529 (diff) | |
| parent | 306ebf7b1c1b26b45e93fbcbbf248b3479142c41 (diff) | |
| download | mariadb-git-3c82f72091d2c21519540ee5bcc3b2acadfbf198.tar.gz | |
manual merge
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-utf8.c:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 4ed04e89ce3..c21e9ba4925 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -566,6 +566,7 @@ public: longlong val_int(); String *val_str(String *); my_decimal *val_decimal(my_decimal *); + bool fix_fields(THD *thd,struct st_table_list *tlist, Item **ref); void fix_length_and_dec(); uint decimal_precision() const; table_map not_null_tables() const { return 0; } |