diff options
| author | unknown <aivanov@mysql.com> | 2005-09-06 23:49:54 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2005-09-06 23:49:54 +0400 |
| commit | 910317bc2b3a41388b18202021aa70d008ec1aeb (patch) | |
| tree | 1af15a439fb22ebeb88a4f36cf2daea85f70faae /sql/opt_range.cc | |
| parent | 23678a927081e3c13a18522dbe057c7deb98bc13 (diff) | |
| parent | 86b61e971ed23b6e378a874d8f2854b537357512 (diff) | |
| download | mariadb-git-910317bc2b3a41388b18202021aa70d008ec1aeb.tar.gz | |
Merge mysql.com:/home/alexi/dev/mysql-4.1-0
into mysql.com:/home/alexi/dev/mysql-5.0-0
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/join_outer.result:
Manual merge
mysql-test/t/join_outer.test:
Manual merge
sql/item_cmpfunc.h:
Manual merge
sql/opt_range.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
BitKeeper/etc/RESYNC_TREE:
New BitKeeper file ``BitKeeper/etc/RESYNC_TREE''
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 3fabb1667e9..ecf4b5de1cb 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3538,7 +3538,6 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond) } else if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE) DBUG_RETURN(0); - param->cond= cond; switch (cond_func->functype()) { |