From: Dmitry Shulga
Date: June 1 2011 11:22am
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3419) Bug#11763757
List-Archive: http://lists.mysql.com/commits/138542
X-Bug: 11763757
Message-Id: <201106011122.p51BMWYr027632@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4928950039429684163=="

--===============4928950039429684163==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-5.5/ based on revid:bjorn.munch@stripped

 3419 Dmitry Shulga	2011-06-01
      Added regression test for bug#11763757

    modified:
      mysql-test/r/sp_sync.result
      mysql-test/t/sp_sync.test
=== modified file 'mysql-test/r/sp_sync.result'
--- a/mysql-test/r/sp_sync.result	2010-06-07 07:06:55 +0000
+++ b/mysql-test/r/sp_sync.result	2011-06-01 11:22:21 +0000
@@ -93,3 +93,34 @@ DROP PROCEDURE p1;
 DROP FUNCTION f1;
 DROP TABLES t0, t1;
 SET DEBUG_SYNC= 'RESET';
+#
+# test for bug#11763757 (formerly known as bug#56510)
+#
+GRANT SHOW DATABASES ON *.* TO u1@localhost;
+GRANT ALL PRIVILEGES ON `my.db`.* TO u1@localhost;
+create database `my.db`;
+use `my.db`;
+CREATE FUNCTION f1(a int) RETURNS INT
+BEGIN
+RETURN a;
+END
+|
+connect as user `u1@localhost`
+use `my.db`;
+SELECT f1(1);
+f1(1)
+1
+SELECT `my.db`.f1(2);
+`my.db`.f1(2)
+2
+show create function f1;
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+f1		NULL	latin1	latin1_swedish_ci	latin1_swedish_ci
+SELECT f1(3);
+f1(3)
+3
+SELECT `my.db`.f1(4);
+`my.db`.f1(4)
+4
+DROP DATABASE `my.db`;
+DROP USER u1@localhost;

=== modified file 'mysql-test/t/sp_sync.test'
--- a/mysql-test/t/sp_sync.test	2010-08-06 11:29:37 +0000
+++ b/mysql-test/t/sp_sync.test	2011-06-01 11:22:21 +0000
@@ -151,6 +151,43 @@ DROP FUNCTION f1;
 DROP TABLES t0, t1;
 SET DEBUG_SYNC= 'RESET';
 
+--echo #
+--echo # test for bug#11763757 (formerly known as bug#56510)
+--echo #
+GRANT SHOW DATABASES ON *.* TO u1@localhost;
+GRANT ALL PRIVILEGES ON `my.db`.* TO u1@localhost;
+
+create database `my.db`;
+use `my.db`;
+
+delimiter |;
+
+CREATE FUNCTION f1(a int) RETURNS INT
+BEGIN
+RETURN a;
+END
+|
+
+delimiter ;|
+
+--echo connect as user `u1@localhost`
+connect (connu1, localhost, u1,,);
+connection connu1;
+
+use `my.db`;
+--disable_abort_on_error
+SELECT f1(1);
+SELECT `my.db`.f1(2);
+
+show create function f1;
+
+SELECT f1(3);
+SELECT `my.db`.f1(4);
+
+connection default;
+disconnect connu1;
+DROP DATABASE `my.db`;
+DROP USER u1@localhost;
 
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.


--===============4928950039429684163==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   z7lcn8dxcd20l23c
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# testament_sha1: 244560a075a490e8cb9729b502b0cb73dcc261b1
# timestamp: 2011-06-01 18:22:26 +0700
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.1-\
#   bug11749345/
# base_revision_id: bjorn.munch@stripped\
#   6yxf83on2ohkyrfs
# 
# Begin bundle
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


--===============4928950039429684163==--