Commit 649f3d54 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953


mysql-test/r/view.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp-error.result:
  Manual merge.
parents 82db5471 6d1fdc73

mysql-test/r/sp-error.result

+24 −0
Original line number Diff line number Diff line
@@ -1226,3 +1226,27 @@ END; 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IF NOT EXISTS bug14702()

BEGIN

END' at line 1

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
@@ -1745,6 +1745,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#14702: misleading error message when syntax error in CREATE

# PROCEDURE

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;