Commit bd13f197 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents 7eebb751 82822612

mysql-test/r/view.result

+27 −0
Original line number Diff line number Diff line
@@ -2065,3 +2065,30 @@ pid GROUP_CONCAT(CONCAT(fn,' ',ln) ORDER BY 1) 
2	c d

DROP VIEW v1;

DROP TABLE t1,t2;

CREATE TABLE t1 (id int PRIMARY KEY, f varchar(255));

CREATE VIEW v1 AS SELECT id, f FROM t1 WHERE id <= 2;

INSERT INTO t1 VALUES (2, 'foo2');

INSERT INTO t1 VALUES (1, 'foo1');

SELECT * FROM v1;

id	f

1	foo1

2	foo2

SELECT * FROM v1;

id	f

1	foo1

2	foo2

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (pk int PRIMARY KEY, b int);

CREATE TABLE t2 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t3 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t4 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t5 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE VIEW v1 AS

SELECT t1.pk as a FROM t1,t2,t3,t4,t5

WHERE t1.b IS NULL AND

t1.pk=t2.fk AND t2.pk=t3.fk AND t3.pk=t4.fk AND t4.pk=t5.fk;

SELECT a FROM v1;

a

DROP VIEW v1;

DROP TABLE t1,t2,t3,t4,t5;

mysql-test/t/view.test

+36 −0
Original line number Diff line number Diff line
@@ -1901,3 +1901,39 @@ SELECT pid,GROUP_CONCAT(CONCAT(fn,' ',ln) ORDER BY 1) FROM v1 GROUP BY pid; 


DROP VIEW v1;

DROP TABLE t1,t2;



#

# Test for bug #12382: SELECT * FROM view after INSERT command

#



CREATE TABLE t1 (id int PRIMARY KEY, f varchar(255));

CREATE VIEW v1 AS SELECT id, f FROM t1 WHERE id <= 2;

INSERT INTO t1 VALUES (2, 'foo2');

INSERT INTO t1 VALUES (1, 'foo1');



SELECT * FROM v1;

SELECT * FROM v1;



DROP VIEW v1;

DROP TABLE t1;



#

# Test for bug #12470: crash for a simple select from a view defined

#                      as a join over 5 tables



CREATE TABLE t1 (pk int PRIMARY KEY, b int);

CREATE TABLE t2 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t3 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t4 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE TABLE t5 (pk int PRIMARY KEY, fk int, INDEX idx(fk));

CREATE VIEW v1 AS

  SELECT t1.pk as a FROM t1,t2,t3,t4,t5

    WHERE t1.b IS NULL AND

          t1.pk=t2.fk AND t2.pk=t3.fk AND t3.pk=t4.fk AND t4.pk=t5.fk;



SELECT a FROM v1;



DROP VIEW v1;

DROP TABLE t1,t2,t3,t4,t5;

sql/sql_base.cc

+5 −2
Original line number Diff line number Diff line
@@ -3181,6 +3181,7 @@ bool setup_fields(THD *thd, Item **ref_pointer_array, 
                  List<Item> *sum_func_list, bool allow_sum_func)

{

  reg2 Item *item;

  bool save_set_query_id= thd->set_query_id;

  List_iterator<Item> it(fields);

  DBUG_ENTER("setup_fields");
@@ -3208,6 +3209,7 @@ bool setup_fields(THD *thd, Item **ref_pointer_array, 
    if (!item->fixed && item->fix_fields(thd, it.ref()) ||

	(item= *(it.ref()))->check_cols(1))

    {

      thd->set_query_id= save_set_query_id;

      DBUG_RETURN(TRUE); /* purecov: inspected */

    }

    if (ref)
@@ -3217,6 +3219,7 @@ bool setup_fields(THD *thd, Item **ref_pointer_array, 
      item->split_sum_func(thd, ref_pointer_array, *sum_func_list);

    thd->used_tables|= item->used_tables();

  }

  thd->set_query_id= save_set_query_id;

  DBUG_RETURN(test(thd->net.report_error));

}
@@ -3657,6 +3660,7 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, 
    arena= 0;                                   // For easier test



  thd->set_query_id=1;

  select_lex->cond_count= 0;



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

  {
@@ -3664,7 +3668,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, 
      goto err_no_arena;

  }



  select_lex->cond_count= 0;

  if (*conds)

  {

    thd->where="where clause";