Commit 00c24198 authored by unknown's avatar unknown
Browse files

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

  After merge changes


mysql-test/r/ndb_condition_pushdown.result:
  After merge changes
sql/sql_base.cc:
  After merge changes
sql/opt_range.cc:
  After merge changes
parent f5738219

mysql-test/r/ndb_condition_pushdown.result

+3 −3
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ select auto from t1 where 
('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 @@ select auto from t1 where 
('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 @@ 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') 

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

sql/opt_range.cc

+3 −2
Original line number Diff line number Diff line
@@ -4498,7 +4498,7 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param, 


  MY_BITMAP *covered_fields= &param->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 @@ 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

*/



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)

{

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -5482,7 +5482,7 @@ bool setup_tables_and_check_access(THD *thd, 
                                   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;