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

sql_base.cc, ndb_condition_pushdown.result, opt_range.cc:

Browse Source 
After merge changes
This commit is contained in:
evgen@moonbone.local
2006-08-30 22:11:23 +04:00
parent 8cf9781717
commit fe18e36e73
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/ndb_condition_pushdown.result
View File

@ -1307,7 +1307,7 @@ select auto from t1 where
('1901-01-01 01:01:01' between date_time and date_time) ('1901-01-01 01:01:01' between date_time and date_time)
order by auto; order by auto;
id select_type table type possible_keys key key_len ref rows Extra 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 select auto from t1 where
("aaaa" between string and string) and ("aaaa" between string and string) and
("aaaa" between vstring and vstring) and ("aaaa" between vstring and vstring) and
@ -1409,7 +1409,7 @@ select auto from t1 where
('1901-01-01 01:01:01' not between date_time and date_time) ('1901-01-01 01:01:01' not between date_time and date_time)
order by auto; order by auto;
id select_type table type possible_keys key key_len ref rows Extra 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 select auto from t1 where
("aaaa" not between string and string) and ("aaaa" not between string and string) and
("aaaa" not between vstring and vstring) and ("aaaa" not between vstring and vstring) and
@ -1565,7 +1565,7 @@ time_field not in('01:01:01','03:03:03') and
date_time not in('1901-01-01 01:01:01','1903-03-03 03:03:03') date_time not in('1901-01-01 01:01:01','1903-03-03 03:03:03')
order by auto; order by auto;
id select_type table type possible_keys key key_len ref rows Extra 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 select auto from t1 where
string not in("aaaa","cccc") and string not in("aaaa","cccc") and
vstring not in("aaaa","cccc") and vstring not in("aaaa","cccc") and

5
sql/opt_range.cc
View File

@ -4498,7 +4498,7 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
MY_BITMAP *covered_fields= &param->tmp_covered_fields; MY_BITMAP *covered_fields= &param->tmp_covered_fields;
if (!covered_fields->bitmap) 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); param->fields_bitmap_size);
if (!covered_fields->bitmap || if (!covered_fields->bitmap ||
bitmap_init(covered_fields, covered_fields->bitmap, bitmap_init(covered_fields, covered_fields->bitmap,
@ -5153,7 +5153,8 @@ static SEL_TREE *get_func_mm_tree(RANGE_OPT_PARAM *param, Item_func *cond_func,
Pointer to the tree representing the built conjunction of SEL_TREEs 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, Item_field *field_item, Item *value,
bool inv) bool inv)
{ {

2
sql/sql_base.cc
View File

@ -5482,7 +5482,7 @@ bool setup_tables_and_check_access(THD *thd,
TABLE_LIST *tables, TABLE_LIST *tables,
TABLE_LIST **leaves, TABLE_LIST **leaves,
bool select_insert, bool select_insert,
ulong_want_access_first, ulong want_access_first,
ulong want_access) ulong want_access)
{ {
TABLE_LIST *leaves_tmp= NULL; TABLE_LIST *leaves_tmp= NULL;