bk commit into 5.0 tree (evgen:1.2045) BUG#12812

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2045 05/10/16 22:47:19 evgen@stripped +4 -0
  sp-security.result, sp.result, sp-security.test, sp.test:
    Test for bug#12812 moved from sp.test to sp-security.test

  mysql-test/r/sp-security.result
    1.22 05/10/16 22:46:22 evgen@stripped +12 -0
    Test for bug#12812 moved from sp.test to sp-security.test

  mysql-test/r/sp.result
    1.161 05/10/16 22:46:08 evgen@stripped +0 -12
    Test for bug#12812 moved from sp.test to sp-security.test

  mysql-test/t/sp-security.test
    1.24 05/10/16 22:44:52 evgen@stripped +24 -0
    Test for bug#12812 moved from sp.test to sp-security.test

  mysql-test/t/sp.test
    1.157 05/10/16 22:44:14 evgen@stripped +0 -22
    Test for bug#12812 moved from sp.test to sp-security.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/12812-bug-5.0-mysql

--- 1.21/mysql-test/r/sp-security.result	2005-10-03 21:00:47 +04:00
+++ 1.22/mysql-test/r/sp-security.result	2005-10-16 22:46:22 +04:00
@@ -251,3 +251,15 @@
 drop database mysqltest_1;
 revoke usage on *.* from mysqltest_1@localhost;
 drop user mysqltest_1@localhost;
+drop function if exists bug12812|
+create function bug12812() returns char(2)
+begin
+return 'ok';
+end;
+create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
+SELECT test.bug12812()|
+ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine
'test.bug12812'
+CREATE VIEW v1 AS SELECT test.bug12812()|
+ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine
'test.bug12812'
+DROP USER user_bug12812@localhost|
+drop function bug12812|

--- 1.160/mysql-test/r/sp.result	2005-10-13 18:12:35 +04:00
+++ 1.161/mysql-test/r/sp.result	2005-10-16 22:46:08 +04:00
@@ -3206,18 +3206,6 @@
 return f1;
 end|
 drop function bug9048|
-drop function if exists bug12812|
-create function bug12812() returns char(2)
-begin
-return 'ok';
-end;
-create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
-SELECT test.bug12812()|
-ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine
'test.bug12812'
-CREATE VIEW v1 AS SELECT test.bug12812()|
-ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine
'test.bug12812'
-DROP USER user_bug12812@localhost|
-drop function bug12812|
 drop procedure if exists bug12849_1|
 create procedure bug12849_1(inout x char) select x into x|
 set @var='a'|

--- 1.23/mysql-test/t/sp-security.test	2005-10-03 21:00:49 +04:00
+++ 1.24/mysql-test/t/sp-security.test	2005-10-16 22:44:52 +04:00
@@ -412,4 +412,28 @@
 revoke usage on *.* from mysqltest_1@localhost;
 drop user mysqltest_1@localhost;
 
+#
+# BUG#12812 create view calling a function works without execute right
+#           on function
+delimiter |;
+--disable_warnings
+drop function if exists bug12812|
+--enable_warnings
+create function bug12812() returns char(2)
+begin
+  return 'ok';
+end;
+create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
+--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
+connect (test_user_12812,localhost,user_bug12812,ABC,test)|
+--error 1370
+SELECT test.bug12812()|
+--error 1370
+CREATE VIEW v1 AS SELECT test.bug12812()|
+# Cleanup
+connection default|
+disconnect test_user_12812|
+DROP USER user_bug12812@localhost|
+drop function bug12812|
+delimiter ;|
 # End of 5.0 bugs.

--- 1.156/mysql-test/t/sp.test	2005-10-13 18:11:52 +04:00
+++ 1.157/mysql-test/t/sp.test	2005-10-16 22:44:14 +04:00
@@ -4037,28 +4037,6 @@
 end|
 drop function bug9048|
 
-#
-# BUG#12812 create view calling a function works without execute right
-#           on function
---disable_warnings
-drop function if exists bug12812|
---enable_warnings
-create function bug12812() returns char(2)
-begin
-  return 'ok';
-end;
-create user user_bug12812@localhost IDENTIFIED BY 'ABC'|
---replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
-connect (test_user_12812,localhost,user_bug12812,ABC,test)|
---error 1370
-SELECT test.bug12812()|
---error 1370
-CREATE VIEW v1 AS SELECT test.bug12812()|
-# Cleanup
-connection default|
-disconnect test_user_12812|
-DROP USER user_bug12812@localhost|
-drop function bug12812|
 # Bug #12849 Stored Procedure: Crash on procedure call with CHAR type
 # 'INOUT' parameter
 #