diff options
| author | unknown <igor@olga.mysql.com> | 2007-02-13 16:08:01 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-02-13 16:08:01 -0800 |
| commit | d311c1883d8ccd448e6c5815ad8c10a2925dc52a (patch) | |
| tree | 0ce4c03a9875ad8d90e6ec309401e3d92d2e442b /sql/item_cmpfunc.h | |
| parent | 1e9a377323089d0569dd194a3c7ad75468e2e096 (diff) | |
| parent | 7a498bbf4ae90448065d6d1ed40ad6dab039dd15 (diff) | |
| download | mariadb-git-d311c1883d8ccd448e6c5815ad8c10a2925dc52a.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
BitKeeper/etc/gone:
auto-union
mysys/my_getopt.c:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/select.result:
SCCS merged
mysql-test/t/select.test:
SCCS merged
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) |