From: Dmitry Shulga
Date: June 7 2011 5:13pm
Subject: bzr commit into mysql-5.5 branch (Dmitry.Shulga:3427) Bug#11763757
List-Archive: http://lists.mysql.com/commits/138807
X-Bug: 11763757
Message-Id: <201106071713.p57HDvXj012620@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4005966672349503895=="

--===============4005966672349503895==
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-08
      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-07 17:13:46 +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.
 #
@@ -288,3 +287,25 @@ DROP FUNCTION f1;
 # ------------------------------------------------------------------
 # -- End of 5.1 tests
 # ------------------------------------------------------------------
+#
+# 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;

=== 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-07 17:13:46 +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,7 +439,47 @@ DROP FUNCTION f1;
 --disconnect con1
 --disconnect con2
 
-
 --echo # ------------------------------------------------------------------
 --echo # -- End of 5.1 tests
 --echo # ------------------------------------------------------------------
+
+--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
+


--===============4005966672349503895==
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\
#   e2x8xwemhozosfnp
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug11763757/
# testament_sha1: 3e4e9578b4110c988caff15fdb7b9ee3ca682949
# timestamp: 2011-06-08 00:13:51 +0700
# base_revision_id: rafal.somla@stripped\
#   igs88mozmspm9y2l
# 
# Begin bundle
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


--===============4005966672349503895==--