diff options
| author | igor@olga.mysql.com <> | 2007-02-13 16:08:01 -0800 |
|---|---|---|
| committer | igor@olga.mysql.com <> | 2007-02-13 16:08:01 -0800 |
| commit | 452c134d3ff47ed9ad284dbc6ce7fb3ae7d4e2b7 (patch) | |
| tree | 0ce4c03a9875ad8d90e6ec309401e3d92d2e442b /sql/item_cmpfunc.h | |
| parent | 0df74eae05a15c895dc9c2f13ee8ce4d56961728 (diff) | |
| parent | a196ccafe62fd71f86d0ac8d486ef087984ae3dd (diff) | |
| download | mariadb-git-452c134d3ff47ed9ad284dbc6ce7fb3ae7d4e2b7.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 4a1519a5498..6186d4a78f8 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1381,7 +1381,6 @@ class Item_equal: public Item_bool_func Item *const_item; /* optional constant item equal to fields items */ cmp_item *eval_item; bool cond_false; - DTCollation cmp_collation; public: inline Item_equal() : Item_bool_func(), const_item(0), eval_item(0), cond_false(0) |