diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-03-16 12:59:06 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-03-16 12:59:06 +0400 |
| commit | c976eab11edfc6d9dd1a43aba617df6651d2f05d (patch) | |
| tree | 6b3622da158f4cfa6f1d3b4d7474ed382f5ff7cf /sql/item_cmpfunc.cc | |
| parent | c7fd1fa4968b9649567895af2b5ebf11ca2f5e6c (diff) | |
| parent | 19998067334a588d968cf75e6041a105000cca7b (diff) | |
| download | mariadb-git-c976eab11edfc6d9dd1a43aba617df6651d2f05d.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index b56ad6febd4..ac1af32388f 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -225,6 +225,13 @@ void Item_bool_func2::fix_length_and_dec() } // Make a special case of compare with fields to get nicer DATE comparisons + + if (functype() == LIKE_FUNC) // Disable conversion in case of LIKE function. + { + set_cmp_func(); + return; + } + if (args[0]->type() == FIELD_ITEM) { Field *field=((Item_field*) args[0])->field; |