Commit 62344496 authored by unknown's avatar unknown
Browse files

Manual merge 


sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
parents edcdc57b e02416c5

mysql-test/r/view.result

+20 −20
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ explain extended select c from v1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	5	

Warnings:

Note	1003	select (`test`.`t1`.`b` + 1) AS `c` from `test`.`v1`

Note	1003	select (`test`.`t1`.`b` + 1) AS `c` from `test`.`t1`

create algorithm=temptable view v2 (c) as select b+1 from t1;

show create view v2;

View	Create View
@@ -85,7 +85,7 @@ explain extended select c from v3; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	5	

Warnings:

Note	1003	select ((`test`.`t1`.`b` + 1) + 1) AS `c` from `test`.`v3`

Note	1003	select ((`test`.`t1`.`b` + 1) + 1) AS `c` from `test`.`t1`

create algorithm=temptable view v4 (c) as select c+1 from v2;

select c from v4;

c
@@ -114,7 +114,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	

3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	5	

Warnings:

Note	1003	select (`v2`.`c` + 1) AS `c` from `test`.`v5`

Note	1003	select (`v2`.`c` + 1) AS `c` from `test`.`v2`

create algorithm=temptable view v6 (c) as select c+1 from v1;

select c from v6;

c
@@ -204,21 +204,6 @@ create table t1 (a int); 
insert into t1 values (1), (2), (3);

create view v1 (a) as select a+1 from t1;

create view v2 (a) as select a-1 from t1;

select * from t1 natural left join v1;

a	a

1	NULL

2	2

3	3

select * from v2 natural left join t1;

a	a

0	NULL

1	1

2	2

select * from v2 natural left join v1;

a	a

0	NULL

1	NULL

2	2

drop view v1, v2;

drop table t1;

create table t1 (a int);
@@ -378,7 +363,7 @@ explain extended select * from v1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	5	Using where

Warnings:

Note	1003	select `test`.`t1`.`b` AS `c` from `test`.`v1` where (`test`.`t1`.`a` < 3)

Note	1003	select `test`.`t1`.`b` AS `c` from `test`.`t1` where (`test`.`t1`.`a` < 3)

update v1 set c=c+1;

select * from t1;

a	b
@@ -1393,7 +1378,7 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	

1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	

Warnings:

Note	1003	select `test`.`t3`.`a` AS `a`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`a` AS `b` from `test`.`t3` left join (`test`.`v1` left join `test`.`v2` on((`test`.`t1`.`a` = `test`.`t2`.`a`))) on((`test`.`t3`.`a` = `test`.`t1`.`a`)) where 1

Note	1003	select `test`.`t3`.`a` AS `a`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`a` AS `b` from `test`.`t3` left join (`test`.`t1` left join (`test`.`t2`) on((`test`.`t1`.`a` = `test`.`t2`.`a`))) on((`test`.`t3`.`a` = `test`.`t1`.`a`)) where 1

prepare stmt1 from "select * from t3 left join v4 on (t3.a = v4.a);";

execute stmt1;

a	a	b
@@ -1712,3 +1697,18 @@ a b a b 
3	3	3	3

drop view v1, v2;

drop table t1, t2, t3;

CREATE TABLE t1 (a int);

CREATE TABLE t2 (b int);

INSERT INTO t1 VALUES (1), (2), (3), (4);

INSERT INTO t2 VALUES (4), (2);

CREATE VIEW v1 AS SELECT * FROM t1,t2 WHERE t1.a=t2.b;

SELECT * FROM v1;

a	b

2	2

4	4

CREATE VIEW v2 AS SELECT * FROM v1;

SELECT * FROM v2;

a	b

2	2

4	4

DROP VIEW v2,v1;

mysql-test/t/view.test

+19 −3
Original line number Diff line number Diff line
@@ -148,9 +148,10 @@ insert into t1 values (1), (2), (3); 
create view v1 (a) as select a+1 from t1;

create view v2 (a) as select a-1 from t1;



select * from t1 natural left join v1;

select * from v2 natural left join t1;

select * from v2 natural left join v1;

# WL #2486 should enable these tests

#select * from t1 natural left join v1;

#select * from v2 natural left join t1;

#select * from v2 natural left join v1;



drop view v1, v2;

drop table t1;
@@ -1533,3 +1534,18 @@ select * from v2 A, v2 B where A.a = B.b; 
drop view v1, v2;

drop table t1, t2, t3;



#

# Test case for bug #8528: select from view over multi-table view

#



CREATE TABLE t1 (a int);

CREATE TABLE t2 (b int);

INSERT INTO t1 VALUES (1), (2), (3), (4);

INSERT INTO t2 VALUES (4), (2);



CREATE VIEW v1 AS SELECT * FROM t1,t2 WHERE t1.a=t2.b;

SELECT * FROM v1;

CREATE VIEW v2 AS SELECT * FROM v1;

SELECT * FROM v2;



DROP VIEW v2,v1;

sql/sql_base.cc

+1 −3
Original line number Diff line number Diff line
@@ -3169,10 +3169,8 @@ TABLE_LIST **make_leaves_list(TABLE_LIST **list, TABLE_LIST *tables) 
{

  for (TABLE_LIST *table= tables; table; table= table->next_local)

  {

    if (table->view && !table->table)

    if (table->view && table->effective_algorithm == VIEW_ALGORITHM_MERGE)

    {

      /* it is for multi table views only, check it */

      DBUG_ASSERT(table->ancestor->next_local != 0);

      list= make_leaves_list(list, table->ancestor);

    }

    else

sql/sql_delete.cc

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
    DBUG_RETURN(TRUE);

  if (!(table= table_list->table))

  {

    DBUG_ASSERT(table_list->view &&

		table_list->ancestor && table_list->ancestor->next_local);

    my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0),

	     table_list->view_db.str, table_list->view_name.str);

    DBUG_RETURN(-1);

sql/sql_insert.cc

+2 −6
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, 
  {

    if (!table)

    {

      DBUG_ASSERT(table_list->view &&

                  table_list->ancestor && table_list->ancestor->next_local);

      my_error(ER_VIEW_NO_INSERT_FIELD_LIST, MYF(0),

               table_list->view_db.str, table_list->view_name.str);

      return -1;
@@ -125,7 +123,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, 
    thd->lex->select_lex.no_wrap_view_item= 0;

    if (res)

      return -1;

    if (table == 0)

    if (table_list->effective_algorithm == VIEW_ALGORITHM_MERGE)

    {

      /* it is join view => we need to find table for update */

      List_iterator_fast<Item> it(fields);
@@ -135,7 +133,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, 


      while ((item= it++))

        map|= item->used_tables();

      if (table_list->check_single_table(&tbl, map) || tbl == 0)

      if (table_list->check_single_table(&tbl, map, table_list) || tbl == 0)

      {

        my_error(ER_VIEW_MULTIUPDATE, MYF(0),

                 table_list->view_db.str, table_list->view_name.str);
@@ -709,8 +707,6 @@ static bool mysql_prepare_insert_check_table(THD *thd, TABLE_LIST *table_list, 
    thd->lex->empty_field_list_on_rset= 1;

    if (!table_list->table)

    {

      DBUG_ASSERT(table_list->view &&

                  table_list->ancestor && table_list->ancestor->next_local);

      my_error(ER_VIEW_NO_INSERT_FIELD_LIST, MYF(0),

               table_list->view_db.str, table_list->view_name.str);

      DBUG_RETURN(TRUE);