diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-09-13 00:44:50 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-09-13 00:44:50 +0500 |
| commit | 5b541452a88f656b0ce8f050e38aa757d2883627 (patch) | |
| tree | 7a9f1e8fbbdc8ccd07f27ec07ce8c9b540695a4f /mysql-test/r/sp.result | |
| parent | 0e1cdf8d94a35c339c935ed00b2b63597bd27d47 (diff) | |
| parent | bdf0ab58bee8dcb312d5987b46109bc548b46282 (diff) | |
| download | mariadb-git-5b541452a88f656b0ce8f050e38aa757d2883627.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/sp.result:
SCCS merged
mysql-test/t/sp.test:
SCCS merged
sql/sql_lex.h:
SCCS merged
sql/sql_parse.cc:
SCCS merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index fd09701c125..6c0bc930a8e 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -6546,6 +6546,28 @@ DROP VIEW v1; DROP FUNCTION f1; DROP FUNCTION f2; DROP TABLE t1; +create function f1() +returns int(11) +not deterministic +contains sql +sql security definer +comment '' +begin +declare x int(11); +set x=-1; +return x; +end| +create view v1 as select 1 as one, f1() as days; +show create view test.v1; +View Create View character_set_client collation_connection +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select 1 AS `one`,`f1`() AS `days` latin1 latin1_swedish_ci +select column_name from information_schema.columns +where table_name='v1' and table_schema='test'; +column_name +one +days +drop view v1; +drop function f1; # Bug#13675. |