diff options
| author | unknown <evgen@moonbone.local> | 2006-02-16 21:11:38 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-02-16 21:11:38 +0300 |
| commit | 7a7c1f798390987336ed2633c45f046af34f649c (patch) | |
| tree | 5a23745a94edc0c11d01e40860543f755f50bca2 /sql/item.h | |
| parent | 74f6299efd3091e64f8eaf1c4b5ec979ed97ce03 (diff) | |
| parent | de0c65dd4e925105b2670e2f86a041cd76820e0d (diff) | |
| download | mariadb-git-7a7c1f798390987336ed2633c45f046af34f649c.tar.gz | |
Merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
mysql-test/t/disabled.def:
SCCS 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 af42ce38b9b..8feba903bb2 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1161,6 +1161,7 @@ public: inline uint32 max_disp_length() { return field->max_length(); } Item_field *filed_for_view_update() { return this; } Item *safe_charset_converter(CHARSET_INFO *tocs); + int fix_outer_field(THD *thd, Field **field, Item **reference); friend class Item_default_value; friend class Item_insert_value; friend class st_select_lex_unit; |