Commit 6d1fdc73 authored by unknown's avatar unknown
Browse files

BUG#20953: create proc with a create view that uses local vars/params 

           should fail to create

The problem was that this type of errors was checked during view
creation, which doesn't happen when CREATE VIEW is a statement of
a created stored routine.

The solution is to perform the checks at parse time.  The idea of the
fix is that the parser checks if a construction just parsed is allowed
in current circumstances by testing certain flags, and this flags are
reset for VIEWs.

The side effect of this change is that if the user already have
such bogus routines, it will now get a error when trying to do

  SHOW CREATE PROCEDURE proc;

(and some other) and when trying to execute such routine he will get

  ERROR 1457 (HY000): Failed to load routine test.p5. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

However there should be very few such users (if any), and they may
(and should) drop these bogus routines.


mysql-test/r/sp-error.result:
  Add result for bug#20953: create proc with a create view that uses
  local vars/params should fail to create.
mysql-test/r/view.result:
  Update results.
mysql-test/t/sp-error.test:
  Add test case for bug#20953: create proc with a create view that uses
  local vars/params should fail to create.
mysql-test/t/view.test:
  Add second test for variable in a view.
  Remove SP variable in a view test, as it tests wrong behaviour.
  Add test for derived table in a view.
sql/sql_lex.cc:
  Remove LEX::variables_used.
sql/sql_lex.h:
  Remove LEX::variables_used and add st_parsing_options structure and
  LEX::parsing_options member.
sql/sql_view.cc:
  Move some error checking to sql/sql_yacc.yy.
sql/sql_yacc.yy:
  Check for disallowed syntax in a CREATE VIEW at parse time to rise a
  error when it is used inside CREATE PROCEDURE and CREATE FUNCTION, as
  well as by itself.
parent ec4a7522

mysql-test/r/sp-error.result

+24 −0
Original line number Diff line number Diff line
@@ -1174,3 +1174,27 @@ drop procedure bug15091; 
drop function if exists bug16896;

create aggregate function bug16896() returns int return 1;

ERROR 42000: AGGREGATE is not supported for stored functions

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT);

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO @a;

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO DUMPFILE "file";

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO OUTFILE "file";

ERROR HY000: View's SELECT contains a 'INTO' clause

CREATE PROCEDURE bug20953()

CREATE VIEW v AS SELECT i FROM t1 PROCEDURE ANALYSE();

ERROR HY000: View's SELECT contains a 'PROCEDURE' clause

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 FROM (SELECT 1) AS d1;

ERROR HY000: View's SELECT contains a subquery in the FROM clause

CREATE PROCEDURE bug20953(i INT) CREATE VIEW v AS SELECT i;

ERROR HY000: View's SELECT contains a variable or parameter

CREATE PROCEDURE bug20953()

BEGIN

DECLARE i INT;

CREATE VIEW v AS SELECT i;

END |

ERROR HY000: View's SELECT contains a variable or parameter

PREPARE stmt FROM "CREATE VIEW v AS SELECT ?";

ERROR HY000: View's SELECT contains a variable or parameter

DROP TABLE t1;

mysql-test/r/view.result

+5 −5
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ create table t1 (a int, b int); 
insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);

create view v1 (c,d) as select a,b+@@global.max_user_connections from t1;

ERROR HY000: View's SELECT contains a variable or parameter

create view v1 (c,d) as select a,b from t1

where a = @@global.max_user_connections;

ERROR HY000: View's SELECT contains a variable or parameter

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

select c from v1;

c
@@ -596,11 +599,6 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function 
drop view v1;

create view v1 (a,a) as select 'a','a';

ERROR 42S21: Duplicate column name 'a'

drop procedure if exists p1;

create procedure p1 () begin declare v int; create view v1 as select v; end;//

call p1();

ERROR HY000: View's SELECT contains a variable or parameter

drop procedure p1;

create table t1 (col1 int,col2 char(22));

insert into t1 values(5,'Hello, world of views');

create view v1 as select * from t1;
@@ -886,6 +884,8 @@ ERROR HY000: View's SELECT contains a 'INTO' clause 
create table t1 (a int);

create view v1 as select a from t1 procedure analyse();

ERROR HY000: View's SELECT contains a 'PROCEDURE' clause

create view v1 as select 1 from (select 1) as d1;

ERROR HY000: View's SELECT contains a subquery in the FROM clause

drop table t1;

create table t1 (s1 int, primary key (s1));

create view v1 as select * from t1;

mysql-test/t/sp-error.test

+42 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,48 @@ drop function if exists bug16896; 
create aggregate function bug16896() returns int return 1;







#

# BUG#20953: create proc with a create view that uses local

# vars/params should fail to create

#

# See test case for what syntax is forbidden in a view.

#

--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



CREATE TABLE t1 (i INT);



# We do not have to drop this procedure and view because they won't be

# created.

--error ER_VIEW_SELECT_CLAUSE

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO @a;

--error ER_VIEW_SELECT_CLAUSE

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO DUMPFILE "file";

--error ER_VIEW_SELECT_CLAUSE

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 INTO OUTFILE "file";

--error ER_VIEW_SELECT_CLAUSE

CREATE PROCEDURE bug20953()

  CREATE VIEW v AS SELECT i FROM t1 PROCEDURE ANALYSE();

--error ER_VIEW_SELECT_DERIVED

CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 FROM (SELECT 1) AS d1;

--error ER_VIEW_SELECT_VARIABLE

CREATE PROCEDURE bug20953(i INT) CREATE VIEW v AS SELECT i;

delimiter |;

--error ER_VIEW_SELECT_VARIABLE

CREATE PROCEDURE bug20953()

BEGIN

  DECLARE i INT;

  CREATE VIEW v AS SELECT i;

END |

delimiter ;|

--error ER_VIEW_SELECT_VARIABLE

PREPARE stmt FROM "CREATE VIEW v AS SELECT ?";



DROP TABLE t1;





#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/view.test

+6 −14
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@ create table t1 (a int, b int); 
insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);



# view with variable

-- error 1351

-- error ER_VIEW_SELECT_VARIABLE

create view v1 (c,d) as select a,b+@@global.max_user_connections from t1;

-- error ER_VIEW_SELECT_VARIABLE

create view v1 (c,d) as select a,b from t1

  where a = @@global.max_user_connections;



# simple view

create view v1 (c) as select b+1 from t1;
@@ -486,19 +489,6 @@ drop view v1; 
-- error 1060

create view v1 (a,a) as select 'a','a';



#

# SP variables inside view test

#

--disable_warnings

drop procedure if exists p1;

--enable_warnings

delimiter //;

create procedure p1 () begin declare v int; create view v1 as select v; end;//

delimiter ;//

-- error 1351

call p1();

drop procedure p1;



#

# updatablity should be transitive

#
@@ -820,6 +810,8 @@ create view v1 as select 5 into outfile 'ttt'; 
create table t1 (a int);

-- error 1350

create view v1 as select a from t1 procedure analyse();

-- error ER_VIEW_SELECT_DERIVED

create view v1 as select 1 from (select 1) as d1;

drop table t1;



#

sql/sql_lex.cc

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ void lex_start(THD *thd, uchar *buf,uint length) 
  lex->safe_to_cache_query= 1;

  lex->time_zone_tables_used= 0;

  lex->leaf_tables_insert= 0;

  lex->variables_used= 0;

  lex->empty_field_list_on_rset= 0;

  lex->select_lex.select_number= 1;

  lex->next_state=MY_LEX_START;