Commit 51f8821a authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 

into igor-inspiron.creware.com:/home/igor/mysql-5.0


sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
parents bc1775ff 338259ad

mysql-test/r/subselect.result

+6 −0
Original line number Diff line number Diff line
@@ -2837,3 +2837,9 @@ WHERE select_id = 0 OR select_id = 1); 
values_id

1

DROP TABLE t1, t2;

create table t1 (fld enum('0','1'));

insert into t1 values ('1');

select * from (select max(fld) from t1) as foo;

max(fld)

1

drop table t1;

mysql-test/r/view.result

+8 −0
Original line number Diff line number Diff line
@@ -1923,6 +1923,14 @@ ERROR HY000: Field of view 'test.v2' underlying table doesn't have a default val 
set sql_mode=default;

drop view v2,v1;

drop table t1;

create table t1 (f1 int);

insert into t1 values (1);

create view v1 as select f1 from t1;

select f1 as alias from v1;

alias

1

drop view v1;

drop table t1;

CREATE TABLE t1 (s1 int, s2 int);

INSERT  INTO t1 VALUES (1,2);

CREATE VIEW v1 AS SELECT s2 AS s1, s1 AS s2 FROM t1;

mysql-test/t/subselect.test

+8 −0
Original line number Diff line number Diff line
@@ -1859,3 +1859,11 @@ WHERE values_id IN (SELECT values_id FROM t2 
                    WHERE select_id = 0 OR select_id = 1);



DROP TABLE t1, t2;



# BUG#11821 : Select from subselect using aggregate function on an enum

# segfaults:

create table t1 (fld enum('0','1'));

insert into t1 values ('1');

select * from (select max(fld) from t1) as foo;

drop table t1;

mysql-test/t/view.test

+10 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,16 @@ set sql_mode=default; 
drop view v2,v1;

drop table t1;



#

# Bug#11399 Use an alias in a select statement on a view

#

create table t1 (f1 int);

insert into t1 values (1);

create view v1 as select f1 from t1;

select f1 as alias from v1;

drop view v1;

drop table t1;



#

# Test for bug #6120: SP cache to be invalidated when altering a view

#

sql/item.cc

+6 −2
Original line number Diff line number Diff line
@@ -5421,9 +5421,13 @@ void Item_type_holder::get_full_info(Item *item) 
  if (fld_type == MYSQL_TYPE_ENUM ||

      fld_type == MYSQL_TYPE_SET)

  {

    if (item->type() == Item::SUM_FUNC_ITEM &&

        (((Item_sum*)item)->sum_func() == Item_sum::MAX_FUNC ||

         ((Item_sum*)item)->sum_func() == Item_sum::MIN_FUNC))

      item = ((Item_sum*)item)->args[0];

    /*

      We can have enum/set type after merging only if we have one enum/set

      field and number of NULL fields

      We can have enum/set type after merging only if we have one enum|set

      field (or MIN|MAX(enum|set field)) and number of NULL fields

    */

    DBUG_ASSERT((enum_set_typelib &&

                 get_real_type(item) == MYSQL_TYPE_NULL) ||