database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
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
This commit is contained in:
unknown
2007-03-06 13:44:57 +01:00
parent 39622e1267 793a137ddd
commit b64a406013
62 changed files with 1203 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_range.cc
View File

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