Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2299 06/04/06 21:26:23 sergefp@stripped +1 -0
Merge spetrunia@stripped:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd
sql/opt_range.cc
1.212 06/04/06 21:26:21 sergefp@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: sergefp
# Host: newbox.mylan
# Root: /home/psergey/mysql-5.1-bug18558-pnd/RESYNC
--- 1.211/sql/opt_range.cc 2006-04-06 13:36:07 +04:00
+++ 1.212/sql/opt_range.cc 2006-04-06 21:26:21 +04:00
@@ -2296,8 +2296,6 @@
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 @@
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
| Thread |
|---|
| • bk commit into 5.1 tree (sergefp:1.2299) | Sergey Petrunia | 6 Apr |