database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/alexi/dev/mysql-4.1-0

Browse Source 
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''
This commit is contained in:
unknown
2005-09-06 23:49:54 +04:00
parent 9e7a1bb2b0 f1cc504981
commit 2e883d19cf
7 changed files with 374 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/opt_range.cc
View File

@ -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()) {