Commit 75066a6a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/psergey/tmp_merge 

into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged
parents 4db329fb 5b09d7a5

mysql-test/r/innodb_mysql.result

+56 −1
Original line number Diff line number Diff line 
drop table if exists t1;
 
drop table if exists t1,t2;

create table t1 (

c_id int(11) not null default '0',

org_id int(11) default null,

unique key contacts$c_id (c_id),

key contacts$org_id (org_id)

) engine=innodb;

insert into t1 values 

(2,null),(120,null),(141,null),(218,7), (128,1),

(151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),

(246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);

create table t2 (

slai_id int(11) not null default '0',

owner_tbl int(11) default null,

owner_id int(11) default null,

sla_id int(11) default null,

inc_web int(11) default null,

inc_email int(11) default null,

inc_chat int(11) default null,

inc_csr int(11) default null,

inc_total int(11) default null,

time_billed int(11) default null,

activedate timestamp null default null,

expiredate timestamp null default null,

state int(11) default null,

sla_set int(11) default null,

unique key t2$slai_id (slai_id),

key t2$owner_id (owner_id),

key t2$sla_id (sla_id)

) engine=innodb;

insert into t2(slai_id, owner_tbl, owner_id, sla_id) values

(1,3,1,1), (3,3,10,2), (4,3,3,6), (5,3,2,5), (6,3,8,3), (7,3,9,7),

(8,3,6,8), (9,3,4,9), (10,3,5,10), (11,3,11,11), (12,3,7,12);

flush tables;

select si.slai_id

from t1 c join t2 si on

((si.owner_tbl = 3 and si.owner_id = c.org_id) or 

( si.owner_tbl = 2 and si.owner_id = c.c_id)) 

where 

c.c_id = 218 and expiredate is null;

slai_id

12

select * from t1 where org_id is null;

c_id	org_id

2	NULL

120	NULL

141	NULL

select si.slai_id

from t1 c join t2 si on

((si.owner_tbl = 3 and si.owner_id = c.org_id) or 

( si.owner_tbl = 2 and si.owner_id = c.c_id)) 

where 

c.c_id = 218 and expiredate is null;

slai_id

12

drop table t1, t2;

mysql-test/t/innodb_mysql.test

+55 −1
Original line number Diff line number Diff line 
-- source include/have_innodb.inc



--disable_warnings

drop table if exists t1;

drop table if exists t1,t2;

--enable_warnings



# BUG#16798: Uninitialized row buffer reads in ref-or-null optimizer

# (repeatable only w/innodb).

create table t1 (

  c_id int(11) not null default '0',

  org_id int(11) default null,

  unique key contacts$c_id (c_id),

  key contacts$org_id (org_id)

) engine=innodb;

insert into t1 values 

  (2,null),(120,null),(141,null),(218,7), (128,1),

  (151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),

  (246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);



create table t2 (

  slai_id int(11) not null default '0',

  owner_tbl int(11) default null,

  owner_id int(11) default null,

  sla_id int(11) default null,

  inc_web int(11) default null,

  inc_email int(11) default null,

  inc_chat int(11) default null,

  inc_csr int(11) default null,

  inc_total int(11) default null,

  time_billed int(11) default null,

  activedate timestamp null default null,

  expiredate timestamp null default null,

  state int(11) default null,

  sla_set int(11) default null,

  unique key t2$slai_id (slai_id),

  key t2$owner_id (owner_id),

  key t2$sla_id (sla_id)

) engine=innodb;

insert into t2(slai_id, owner_tbl, owner_id, sla_id) values

  (1,3,1,1), (3,3,10,2), (4,3,3,6), (5,3,2,5), (6,3,8,3), (7,3,9,7),

  (8,3,6,8), (9,3,4,9), (10,3,5,10), (11,3,11,11), (12,3,7,12);



flush tables;

select si.slai_id

from t1 c join t2 si on

  ((si.owner_tbl = 3 and si.owner_id = c.org_id) or 

   ( si.owner_tbl = 2 and si.owner_id = c.c_id)) 

where 

  c.c_id = 218 and expiredate is null;

  

select * from t1 where org_id is null;

select si.slai_id

from t1 c join t2 si on

  ((si.owner_tbl = 3 and si.owner_id = c.org_id) or 

   ( si.owner_tbl = 2 and si.owner_id = c.c_id)) 

where 

  c.c_id = 218 and expiredate is null;



drop table t1, t2;

sql/sql_select.cc

+15 −2
Original line number Diff line number Diff line
@@ -2419,7 +2419,19 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, 
    {

      if (old->field == new_fields->field)

      {

	if (new_fields->val->used_tables())

        /*

          NOTE: below const_item() call really works as "!used_tables()", i.e.

          it can return FALSE where it is feasible to make it return TRUE.

          

          The cause is as follows: Some of the tables are already known to be

          const tables (the detection code is in make_join_statistics(),

          above the update_ref_and_keys() call), but we didn't propagate 

          information about this: TABLE::const_table is not set to TRUE, and

          Item::update_used_tables() hasn't been called for each item.

          The result of this is that we're missing some 'ref' accesses.

          TODO: OptimizerTeam: Fix this

        */

	if (!new_fields->val->const_item())

	{

	  /*

	    If the value matches, we can use the key reference.
@@ -2449,7 +2461,8 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, 
                                new_fields->null_rejecting);

	}

	else if (old->eq_func && new_fields->eq_func &&

		 (old->val->is_null() || new_fields->val->is_null()))

		 ((old->val->const_item() && old->val->is_null()) || 

                  new_fields->val->is_null()))

	{

	  /* field = expression OR field IS NULL */

	  old->level= and_level;