diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-09-06 22:27:13 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-09-06 22:27:13 +0500 |
commit | 76e37a32b8a3c7c74a2cbee8b292632a4c04fb3d (patch) | |
tree | 9eb27a546ea7e971574d189ccbc932d7ab5c5ac8 /mysql-test/r/sp.result | |
parent | 7cafddc3454e60a95ef1f7059d3b5954a1e4d1b6 (diff) | |
parent | 403ed43b1d338e7e7b845546178cac2e3334e1e2 (diff) | |
download | mariadb-git-76e37a32b8a3c7c74a2cbee8b292632a4c04fb3d.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto 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 2cfbe7aadcb..d446361cea8 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -6315,4 +6315,26 @@ CALL p1(); NULL SET NAMES default; DROP PROCEDURE p1; +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 +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select 1 AS `one`,`f1`() AS `days` +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; End of 5.0 tests |