diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-02 18:50:14 +0300 |
| commit | f26ac4ba7a82a63c3e230668d14e377602c55bca (patch) | |
| tree | 5c1a2630e01dc79cf5496ed561d050026dae416b /sql/item.h | |
| parent | 0fe17677d8d16dddd17b2a52edd2da98f287d581 (diff) | |
| parent | e8e85ed2a6fc6b1091ac62590f9084b9eae00d50 (diff) | |
| download | mariadb-git-f26ac4ba7a82a63c3e230668d14e377602c55bca.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sql_yacc.yy
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 0556c330088..a963206a2dc 100644 --- a/sql/item.h +++ b/sql/item.h @@ -3212,5 +3212,4 @@ extern Cached_item *new_Cached_item(THD *thd, Item *item); extern Item_result item_cmp_type(Item_result a,Item_result b); extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item); extern int stored_field_cmp_to_item(THD *thd, Field *field, Item *item); - #endif /* ITEM_INCLUDED */ |