From: Dmitry Shulga
Date: June 6 2011 9:09am
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3427) Bug#11763757
List-Archive: http://lists.mysql.com/commits/138679
X-Bug: 11763757
Message-Id: <201106060909.p5699Hoa022008@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1816956349631830012=="

--===============1816956349631830012==
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-bug11763757/ based on revid:rafal.somla@stripped

 3427 Dmitry Shulga	2011-06-06
      Added regression test for bug#11763757 "56510: ERROR 42000:
      FUNCTION DOES NOT EXIST IF NOT-PRIV USER RECONNECTS".
      
      The bug itself was fixed by the same patch as bug@11747137
      "30977: CONCURRENT STATEMENT USING STORED FUNCTION AND DROP
      FUNCTION BREAKS SBR".

    modified:
      mysql-test/r/sp_notembedded.result
      mysql-test/t/sp_notembedded.test
=== modified file 'mysql-test/r/sp_notembedded.result'
--- a/mysql-test/r/sp_notembedded.result	2011-03-18 14:16:17 +0000
+++ b/mysql-test/r/sp_notembedded.result	2011-06-06 09:08:56 +0000
@@ -254,7 +254,6 @@ CREATE PROCEDURE p1(i INT) BEGIN END;
 DROP PROCEDURE p1;
 DELETE FROM mysql.user WHERE User='mysqltest_1';
 FLUSH PRIVILEGES;
-set @@global.concurrent_insert= @old_concurrent_insert;
 #
 # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
 #
@@ -285,6 +284,28 @@ ERROR 70100: Query execution was interru
 DROP VIEW v1;
 DROP TABLE t1;
 DROP FUNCTION f1;
+#
+# Test for bug#11763757 "56510: ERROR 42000: FUNCTION DOES NOT EXIST
+# IF NOT-PRIV USER RECONNECTS ".
+#
+# The real problem was that server was unable handle properly stored
+# functions in databases which names contained dot.
+#
+DROP DATABASE IF EXISTS `my.db`;
+create database `my.db`;
+use `my.db`;
+CREATE FUNCTION f1(a int) RETURNS INT RETURN a;
+# Create new connection.
+USE `my.db`;
+SELECT f1(1);
+f1(1)
+1
+SELECT `my.db`.f1(2);
+`my.db`.f1(2)
+2
+# Switching to default connection.
+DROP DATABASE `my.db`;
+set @@global.concurrent_insert= @old_concurrent_insert;
 # ------------------------------------------------------------------
 # -- End of 5.1 tests
 # ------------------------------------------------------------------

=== modified file 'mysql-test/t/sp_notembedded.test'
--- a/mysql-test/t/sp_notembedded.test	2010-08-06 11:29:37 +0000
+++ b/mysql-test/t/sp_notembedded.test	2011-06-06 09:08:56 +0000
@@ -371,16 +371,6 @@ DELETE FROM mysql.user WHERE User='mysql
 FLUSH PRIVILEGES;
 
 
-#
-# Restore global concurrent_insert value. Keep in the end of the test file.
-#
-
-set @@global.concurrent_insert= @old_concurrent_insert;
-
-# Wait till all disconnects are completed
---source include/wait_until_count_sessions.inc
-
-
 --echo #
 --echo # Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.
 --echo #
@@ -449,6 +439,46 @@ DROP FUNCTION f1;
 --disconnect con1
 --disconnect con2
 
+--echo #
+--echo # Test for bug#11763757 "56510: ERROR 42000: FUNCTION DOES NOT EXIST
+--echo # IF NOT-PRIV USER RECONNECTS ".
+--echo #
+--echo # The real problem was that server was unable handle properly stored
+--echo # functions in databases which names contained dot.
+--echo #
+
+connection default;
+
+--disable_warnings
+DROP DATABASE IF EXISTS `my.db`;
+--enable_warnings
+
+create database `my.db`;
+use `my.db`;
+
+CREATE FUNCTION f1(a int) RETURNS INT RETURN a;
+
+--echo # Create new connection.
+connect (addcon, localhost, root,,);
+connection addcon;
+USE `my.db`;
+SELECT f1(1);
+SELECT `my.db`.f1(2);
+
+--echo # Switching to default connection.
+connection default;
+disconnect addcon;
+DROP DATABASE `my.db`;
+
+#
+# Restore global concurrent_insert value. Keep in the end of the test file.
+#
+
+set @@global.concurrent_insert= @old_concurrent_insert;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
+
 
 --echo # ------------------------------------------------------------------
 --echo # -- End of 5.1 tests


--===============1816956349631830012==
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\
#   5uvnnjn02mrhcop9
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug11763757/
# testament_sha1: 06f0833debdde0271a0d44a48bc5619c42a67810
# timestamp: 2011-06-06 16:09:09 +0700
# base_revision_id: rafal.somla@stripped\
#   igs88mozmspm9y2l
# 
# Begin bundle
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


--===============1816956349631830012==--