Below is the list of changes that have just been committed into a local
5.1 repository of evgen. When evgen 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@stripped, 2006-08-30 22:11:23+04:00, evgen@stripped +3 -0
sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:
After merge changes
mysql-test/r/ndb_condition_pushdown.result@stripped, 2006-08-30 22:10:41+04:00, evgen@stripped +3 -3
After merge changes
sql/opt_range.cc@stripped, 2006-08-30 22:10:58+04:00, evgen@stripped +3 -2
After merge changes
sql/sql_base.cc@stripped, 2006-08-30 22:10:55+04:00, evgen@stripped +1 -1
After merge changes
# 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: evgen
# Host: moonbone.local
# Root: /work/tmp_merge-5.1-opt-mysql
--- 1.230/sql/opt_range.cc 2006-08-30 22:11:28 +04:00
+++ 1.231/sql/opt_range.cc 2006-08-30 22:11:28 +04:00
@@ -4498,7 +4498,7 @@
MY_BITMAP *covered_fields= ¶m->tmp_covered_fields;
if (!covered_fields->bitmap)
- covered_fields->bitmap= (uchar*)alloc_root(param->mem_root,
+ covered_fields->bitmap= (my_bitmap_map*)alloc_root(param->mem_root,
param->fields_bitmap_size);
if (!covered_fields->bitmap ||
bitmap_init(covered_fields, covered_fields->bitmap,
@@ -5153,7 +5153,8 @@
Pointer to the tree representing the built conjunction of SEL_TREEs
*/
-static SEL_TREE *get_full_func_mm_tree(PARAM *param, Item_func *cond_func,
+static SEL_TREE *get_full_func_mm_tree(RANGE_OPT_PARAM *param,
+ Item_func *cond_func,
Item_field *field_item, Item *value,
bool inv)
{
--- 1.347/sql/sql_base.cc 2006-08-30 22:11:28 +04:00
+++ 1.348/sql/sql_base.cc 2006-08-30 22:11:28 +04:00
@@ -5482,7 +5482,7 @@
TABLE_LIST *tables,
TABLE_LIST **leaves,
bool select_insert,
- ulong_want_access_first,
+ ulong want_access_first,
ulong want_access)
{
TABLE_LIST *leaves_tmp= NULL;
--- 1.25/mysql-test/r/ndb_condition_pushdown.result 2006-08-30 22:11:28 +04:00
+++ 1.26/mysql-test/r/ndb_condition_pushdown.result 2006-08-30 22:11:28 +04:00
@@ -1307,7 +1307,7 @@
('1901-01-01 01:01:01' between date_time and date_time)
order by auto;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 range medium_index medium_index 3 NULL 10 Using where with pushed condition; Using filesort
+1 SIMPLE t1 range medium_index medium_index 3 NULL 1 Using where with pushed condition; Using filesort
select auto from t1 where
("aaaa" between string and string) and
("aaaa" between vstring and vstring) and
@@ -1409,7 +1409,7 @@
('1901-01-01 01:01:01' not between date_time and date_time)
order by auto;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 range medium_index medium_index 3 NULL 20 Using where with pushed condition; Using filesort
+1 SIMPLE t1 range medium_index medium_index 3 NULL 3 Using where with pushed condition; Using filesort
select auto from t1 where
("aaaa" not between string and string) and
("aaaa" not between vstring and vstring) and
@@ -1565,7 +1565,7 @@
date_time not in('1901-01-01 01:01:01','1903-03-03 03:03:03')
order by auto;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 range medium_index medium_index 3 NULL 2 Using where with pushed condition; Using filesort
+1 SIMPLE t1 range medium_index medium_index 3 NULL 6 Using where with pushed condition; Using filesort
select auto from t1 where
string not in("aaaa","cccc") and
vstring not in("aaaa","cccc") and
| Thread |
|---|
| • bk commit into 5.1 tree (evgen:1.2287) | eugene | 30 Aug |
