database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

checked INTO clause during view creation (BUG#5332)

Browse Source 
include/mysqld_error.h:
  bug name and number of bugs fixed
mysql-test/r/view.result:
  VIEW over SELECT with prohibited clauses
mysql-test/t/view.test:
  VIEW over SELECT with prohibited clauses
sql/share/czech/errmsg.txt:
  error message made more general
sql/share/danish/errmsg.txt:
  error message made more general
sql/share/dutch/errmsg.txt:
  error message made more general
sql/share/english/errmsg.txt:
  error message made more general
sql/share/estonian/errmsg.txt:
  error message made more general
sql/share/french/errmsg.txt:
  error message made more general
sql/share/german/errmsg.txt:
  error message made more general
sql/share/greek/errmsg.txt:
  error message made more general
sql/share/hungarian/errmsg.txt:
  error message made more general
sql/share/italian/errmsg.txt:
  error message made more general
sql/share/japanese/errmsg.txt:
  error message made more general
sql/share/korean/errmsg.txt:
  error message made more general
sql/share/norwegian-ny/errmsg.txt:
  error message made more general
sql/share/norwegian/errmsg.txt:
  error message made more general
sql/share/polish/errmsg.txt:
  error message made more general
sql/share/portuguese/errmsg.txt:
  error message made more general
sql/share/romanian/errmsg.txt:
  error message made more general
sql/share/russian/errmsg.txt:
  error message made more general
sql/share/serbian/errmsg.txt:
  error message made more general
sql/share/slovak/errmsg.txt:
  error message made more general
sql/share/spanish/errmsg.txt:
  error message made more general
sql/share/swedish/errmsg.txt:
  error message made more general
sql/share/ukrainian/errmsg.txt:
  error message made more general
sql/sql_view.cc:
  checked INTO clause during view creation
This commit is contained in:
unknown
2004-09-02 12:09:26 +03:00
parent 55b806b517
commit 5feaa7b677
27 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysqld_error.h
View File

@@ -365,7 +365,7 @@
#define ER_WRONG_OBJECT 1346
#define ER_NONUPDATEABLE_COLUMN 1347
#define ER_VIEW_SELECT_DERIVED 1348
#define ER_VIEW_SELECT_PROCEDURE 1349
#define ER_VIEW_SELECT_CLAUSE 1349
#define ER_VIEW_SELECT_VARIABLE 1350
#define ER_VIEW_SELECT_TMPTABLE 1351
#define ER_VIEW_WRONG_LIST 1352
@@ -374,4 +374,4 @@
#define ER_VIEW_INVALID 1355
#define ER_SP_NO_DROP_SP 1356
#define ER_SP_GOTO_IN_HNDLR 1357
#define ER_ERROR_MESSAGES 357
#define ER_ERROR_MESSAGES 358

8
mysql-test/r/view.result
View File

@@ -1253,3 +1253,11 @@ create view v4 as select * from v3;
select * from v4;
ERROR 21000: Subquery returns more than 1 row
drop view v4, v3, v2, v1;
create view v1 as select 5 into @w;
ERROR HY000: View's SELECT contains a 'INTO' clause
create view v1 as select 5 into outfile 'ttt';
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
drop table t1;

12
mysql-test/t/view.test
View File

@@ -1207,3 +1207,15 @@ create view v4 as select * from v3;
-- error 1242
select * from v4;
drop view v4, v3, v2, v1;
#
# VIEW over SELECT with prohibited clauses
#
-- error 1349
create view v1 as select 5 into @w;
-- error 1349
create view v1 as select 5 into outfile 'ttt';
create table t1 (a int);
-- error 1349
create view v1 as select a from t1 procedure analyse();
drop table t1;

2
sql/share/czech/errmsg.txt
View File

@@ -361,7 +361,7 @@ character-set=latin2
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

4
sql/share/danish/errmsg.txt
View File

@@ -1,4 +1,4 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
:/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Knud Riish<73>jg<6A>rd knudriis@post.tele.dk 99 &&
@@ -355,7 +355,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/dutch/errmsg.txt
View File

@@ -363,7 +363,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/english/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/estonian/errmsg.txt
View File

@@ -357,7 +357,7 @@ character-set=latin7
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/french/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/german/errmsg.txt
View File

@@ -364,7 +364,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/greek/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=greek
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/hungarian/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=latin2
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/italian/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/japanese/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=ujis
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/korean/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=euckr
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/norwegian-ny/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/norwegian/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/polish/errmsg.txt
View File

@@ -356,7 +356,7 @@ character-set=latin2
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/portuguese/errmsg.txt
View File

@@ -353,7 +353,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/romanian/errmsg.txt
View File

@@ -356,7 +356,7 @@ character-set=latin2
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/russian/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=koi8r
"'%-.64s.%-.64s' - <20><> %s"
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PROCEDURE"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s'"
"View SELECT <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> view <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

2
sql/share/serbian/errmsg.txt
View File

@@ -358,7 +358,7 @@ character-set=cp1250
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/slovak/errmsg.txt
View File

@@ -360,7 +360,7 @@ character-set=latin2
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/spanish/errmsg.txt
View File

@@ -354,7 +354,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/swedish/errmsg.txt
View File

@@ -352,7 +352,7 @@ character-set=latin1
"'%-.64s.%-.64s' is not %s"
"Column '%-.64s' is not updatable"
"View's SELECT contains a subquery in the FROM clause"
"View's SELECT contains a PROCEDURE clause"
"View's SELECT contains a '%s' clause"
"View's SELECT contains a variable or parameter"
"View's SELECT contains a temporary table '%-.64s'"
"View's SELECT and view's field list have different column counts"

2
sql/share/ukrainian/errmsg.txt
View File

@@ -357,7 +357,7 @@ character-set=koi8u
"'%-.64s.%-.64s' <20><> <20> %s"
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
"View SELECT <20><><EFBFBD> Ц<><D0A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> FROM"
"View SELECT <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> PROCEDURE"
"View SELECT <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> '%s'"
"View SELECT <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
"View SELECT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>դ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s'"
"View SELECT <20> <20><><EFBFBD><EFBFBD>̦<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD> view <20><><EFBFBD><EFBFBD><EFBFBD> Ҧ<><D2A6><EFBFBD> ˦<><CBA6>˦<EFBFBD><CBA6><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD>"

17
sql/sql_view.cc
View File

@@ -59,12 +59,21 @@ int mysql_create_view(THD *thd,
int res= 0;
DBUG_ENTER("mysql_create_view");
if (lex->derived_tables || lex->proc_list.first ||
if (lex->proc_list.first ||
lex->result)
{
my_error(ER_VIEW_SELECT_CLAUSE, MYF(0), (lex->result ?
"INTO" :
"PROCEDURE"));
res= -1;
goto err;
}
if (lex->derived_tables ||
lex->variables_used || lex->param_list.elements)
{
my_error((lex->derived_tables ? ER_VIEW_SELECT_DERIVED :
(lex->proc_list.first ? ER_VIEW_SELECT_PROCEDURE :
ER_VIEW_SELECT_VARIABLE)), MYF(0));
my_error((lex->derived_tables ?
ER_VIEW_SELECT_DERIVED :
ER_VIEW_SELECT_VARIABLE), MYF(0));
res= -1;
goto err;
}