diff options
| author | sergefp@mysql.com <> | 2006-04-06 21:26:23 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2006-04-06 21:26:23 +0400 |
| commit | 44628436e5dca929ae0f5732fde2113d93549859 (patch) | |
| tree | 3e2846c5a2473df367744dcf06bbd7aadee8039f /sql/opt_range.cc | |
| parent | fb37c306992f5681eb3c754e6dc4d2298157da2a (diff) | |
| parent | 68bd945ca38046426346f1b22b6e7184c00609b9 (diff) | |
| download | mariadb-git-44628436e5dca929ae0f5732fde2113d93549859.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 7f93327f68a..42f723eb382 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2296,8 +2296,6 @@ bool prune_partitions(THD *thd, TABLE *table, Item *pprune_cond) RANGE_OPT_PARAM *range_par= &prune_param.range_param; prune_param.part_info= part_info; - prune_param.part_iter.has_null_value= FALSE; - init_sql_alloc(&alloc, thd->variables.range_alloc_block_size, 0); range_par->mem_root= &alloc; range_par->old_root= thd->mem_root; @@ -2730,7 +2728,7 @@ int find_used_partitions(PART_PRUNE_PARAM *ppar, SEL_ARG *key_tree) key_tree->min_flag | key_tree->max_flag, &ppar->part_iter); if (!res) - goto go_right; /* res=0 --> no satisfying partitions */ + goto go_right; /* res==0 --> no satisfying partitions */ if (res == -1) { //get a full range iterator |