diff options
| author | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
| commit | b64a40601310a5e7614aaab6ef4e735b3a7bb3c1 (patch) | |
| tree | 6633aa27d1875e982ecf73b0f605752dcadbc94f /sql/opt_range.cc | |
| parent | 39622e126775b6b7de3b727aa4dd0da5fdab5d74 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-b64a40601310a5e7614aaab6ef4e735b3a7bb3c1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f87439dd3eb..32c7b23ce35 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -4940,8 +4940,8 @@ static SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Item_func *cond_func, type. Tree won't be built for values with different result types, so we check it here to avoid unnecessary work. */ - if (!func->array) - break; + if (!func->arg_types_compatible) + break; if (inv) { |