diff options
| author | marty@linux.site <> | 2005-06-30 12:20:52 +0200 |
|---|---|---|
| committer | marty@linux.site <> | 2005-06-30 12:20:52 +0200 |
| commit | e4aedcc2c137ba667e3d429031ce284032e11060 (patch) | |
| tree | d61554cba3c2aa34bee31d02127690c317681d2a /sql/item_timefunc.cc | |
| parent | 5e4ce743a351f7d1ee55b534dd689e2d082fa146 (diff) | |
| parent | 2eea2f52089028e97ab1c3b9e33e68fd8eadb094 (diff) | |
| download | mariadb-git-e4aedcc2c137ba667e3d429031ce284032e11060.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into linux.site:/home/marty/MySQL/mysql-5.0
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 564c5e4b9cc..19386c15835 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2158,7 +2158,7 @@ bool Item_extract::eq(const Item *item, bool binary_cmp) const if (this == item) return 1; if (item->type() != FUNC_ITEM || - func_name() != ((Item_func*)item)->func_name()) + functype() != ((Item_func*)item)->functype()) return 0; Item_extract* ie= (Item_extract*)item; @@ -2176,7 +2176,7 @@ bool Item_char_typecast::eq(const Item *item, bool binary_cmp) const if (this == item) return 1; if (item->type() != FUNC_ITEM || - func_name() != ((Item_func*)item)->func_name()) + functype() != ((Item_func*)item)->functype()) return 0; Item_char_typecast *cast= (Item_char_typecast*)item; |