Merge from 5.1 to 5.5

6 files changed, 106 insertions, 48 deletions

diff --git a/mysql-test/r/sp-bugs.result b/mysql-test/r/sp-bugs.result
index 056101b9730..9d9deaebcc3 100644
--- a/mysql-test/r/sp-bugs.result
+++ b/mysql-test/r/sp-bugs.result
@@ -147,8 +147,6 @@ BEGIN
 SELECT "PROCEDURE testp_bug11763507";
 END
 $
-CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR 
-DO SELECT 1 $
 SELECT testf_bug11763507();
 testf_bug11763507()
 0
@@ -179,12 +177,6 @@ testf_bug11763507		CREATE DEFINER=`root`@`localhost` FUNCTION `testf_bug11763507
 BEGIN
 RETURN 0;
 END	latin1	latin1_swedish_ci	latin1_swedish_ci
-SHOW FUNCTION CODE testf_bug11763507;
-Pos	Instruction
-0	freturn 3 0
-SHOW FUNCTION CODE TESTF_bug11763507;
-Pos	Instruction
-0	freturn 3 0
 CALL testp_bug11763507();
 PROCEDURE testp_bug11763507
 PROCEDURE testp_bug11763507
@@ -215,24 +207,6 @@ testp_bug11763507		CREATE DEFINER=`root`@`localhost` PROCEDURE `testp_bug1176350
 BEGIN
 SELECT "PROCEDURE testp_bug11763507";
 END	latin1	latin1_swedish_ci	latin1_swedish_ci
-SHOW PROCEDURE CODE testp_bug11763507;
-Pos	Instruction
-0	stmt 0 "SELECT "PROCEDURE testp_bug11763507""
-SHOW PROCEDURE CODE TESTP_bug11763507;
-Pos	Instruction
-0	stmt 0 "SELECT "PROCEDURE testp_bug11763507""
-SHOW EVENTS LIKE 'teste_bug11763507';
-Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-test	teste_bug11763507	root@localhost	SYSTEM	ONE TIME	#	#	#	#	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
-SHOW EVENTS LIKE 'TESTE_bug11763507';
-Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-test	teste_bug11763507	root@localhost	SYSTEM	ONE TIME	#	#	#	#	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
-SHOW CREATE EVENT teste_bug11763507;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-teste_bug11763507		SYSTEM	#	latin1	latin1_swedish_ci	latin1_swedish_ci
-SHOW CREATE EVENT TESTE_bug11763507;
-Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
-teste_bug11763507		SYSTEM	#	latin1	latin1_swedish_ci	latin1_swedish_ci
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'testf_bug11763507';
 specific_name
 testf_bug11763507
@@ -245,7 +219,6 @@ testf_bug11763507
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='TESTF_bug11763507';
 specific_name
 testf_bug11763507
-DROP EVENT teste_bug11763507;
 DROP PROCEDURE testp_bug11763507;
 DROP FUNCTION testf_bug11763507;
 #END OF BUG#11763507 test.
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
index 16a43a00f04..799dddab984 100644
--- a/mysql-test/r/sp-code.result
+++ b/mysql-test/r/sp-code.result
@@ -945,3 +945,32 @@ Error	1329	No data - zero rows fetched, selected, or processed
 SET SESSION debug="-d,bug23032_emit_warning";
 DROP PROCEDURE p1;
 DROP TABLE t1;
+#
+# Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
+#
+SET @@SQL_MODE = '';
+CREATE FUNCTION testf_bug11763507() RETURNS INT
+BEGIN
+RETURN 0;
+END
+$
+CREATE PROCEDURE testp_bug11763507()
+BEGIN
+SELECT "PROCEDURE testp_bug11763507";
+END
+$
+SHOW FUNCTION CODE testf_bug11763507;
+Pos	Instruction
+0	freturn 3 0
+SHOW FUNCTION CODE TESTF_bug11763507;
+Pos	Instruction
+0	freturn 3 0
+SHOW PROCEDURE CODE testp_bug11763507;
+Pos	Instruction
+0	stmt 0 "SELECT "PROCEDURE testp_bug11763507""
+SHOW PROCEDURE CODE TESTP_bug11763507;
+Pos	Instruction
+0	stmt 0 "SELECT "PROCEDURE testp_bug11763507""
+DROP PROCEDURE testp_bug11763507;
+DROP FUNCTION testf_bug11763507;
+#END OF BUG#11763507 test.
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result
index c3c12e6d4b2..7d3f90e157a 100644
--- a/mysql-test/r/sp_notembedded.result
+++ b/mysql-test/r/sp_notembedded.result
@@ -308,4 +308,25 @@ SELECT `my.db`.f1(2);
 2
 # Switching to default connection.
 DROP DATABASE `my.db`;
+USE test;
 set @@global.concurrent_insert= @old_concurrent_insert;
+#
+# Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
+#
+SET @@SQL_MODE = '';
+CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR 
+DO SELECT 1 $
+SHOW EVENTS LIKE 'teste_bug11763507';
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+test	teste_bug11763507	root@localhost	SYSTEM	ONE TIME	#	#	#	#	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+SHOW EVENTS LIKE 'TESTE_bug11763507';
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+test	teste_bug11763507	root@localhost	SYSTEM	ONE TIME	#	#	#	#	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+SHOW CREATE EVENT teste_bug11763507;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+teste_bug11763507		SYSTEM	#	latin1	latin1_swedish_ci	latin1_swedish_ci
+SHOW CREATE EVENT TESTE_bug11763507;
+Event	sql_mode	time_zone	Create Event	character_set_client	collation_connection	Database Collation
+teste_bug11763507		SYSTEM	#	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP EVENT teste_bug11763507;
+#END OF BUG#11763507 test.
diff --git a/mysql-test/t/sp-bugs.test b/mysql-test/t/sp-bugs.test
index 88b12b0ec61..3ab1689e8b2 100644
--- a/mysql-test/t/sp-bugs.test
+++ b/mysql-test/t/sp-bugs.test
@@ -183,9 +183,6 @@ BEGIN
 END
 $
 
-CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR 
-DO SELECT 1 $
-
 DELIMITER ;$
 
 # STORED FUNCTIONS
@@ -204,9 +201,6 @@ SHOW FUNCTION STATUS WHERE NAME='TESTF_bug11763507';
 SHOW CREATE FUNCTION testf_bug11763507;
 SHOW CREATE FUNCTION TESTF_bug11763507;
 
-SHOW FUNCTION CODE testf_bug11763507;
-SHOW FUNCTION CODE TESTF_bug11763507;
-
 # STORED PROCEDURE
 CALL testp_bug11763507();
 CALL TESTP_bug11763507();
@@ -223,20 +217,6 @@ SHOW PROCEDURE STATUS WHERE NAME='TESTP_bug11763507';
 SHOW CREATE PROCEDURE testp_bug11763507;
 SHOW CREATE PROCEDURE TESTP_bug11763507;
 
-SHOW PROCEDURE CODE testp_bug11763507;
-SHOW PROCEDURE CODE TESTP_bug11763507;
-
-# EVENTS
---replace_column 6 # 7 # 8 # 9 #
-SHOW EVENTS LIKE 'teste_bug11763507';
---replace_column 6 # 7 # 8 # 9 #
-SHOW EVENTS LIKE 'TESTE_bug11763507';
-
---replace_column 4 # 
-SHOW CREATE EVENT teste_bug11763507;
---replace_column 4 # 
-SHOW CREATE EVENT TESTE_bug11763507;
-
 # INFORMATION SCHEMA 
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'testf_bug11763507';
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'TESTF_bug11763507';
@@ -244,7 +224,6 @@ SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE '
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='testf_bug11763507';
 SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='TESTF_bug11763507';
 
-DROP EVENT teste_bug11763507;
 DROP PROCEDURE testp_bug11763507;
 DROP FUNCTION testf_bug11763507;
 
diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test
index 90b4c18895a..e8da86ce484 100644
--- a/mysql-test/t/sp-code.test
+++ b/mysql-test/t/sp-code.test
@@ -702,3 +702,35 @@ SET SESSION debug="-d,bug23032_emit_warning";
 
 DROP PROCEDURE p1;
 DROP TABLE t1;
+
+--echo #
+--echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
+--echo #
+SET @@SQL_MODE = '';
+DELIMITER $;
+CREATE FUNCTION testf_bug11763507() RETURNS INT
+BEGIN
+    RETURN 0;
+END
+$
+
+CREATE PROCEDURE testp_bug11763507()
+BEGIN
+    SELECT "PROCEDURE testp_bug11763507";
+END
+$
+
+DELIMITER ;$
+
+# STORED FUNCTIONS
+SHOW FUNCTION CODE testf_bug11763507;
+SHOW FUNCTION CODE TESTF_bug11763507;
+
+# STORED PROCEDURE
+SHOW PROCEDURE CODE testp_bug11763507;
+SHOW PROCEDURE CODE TESTP_bug11763507;
+
+DROP PROCEDURE testp_bug11763507;
+DROP FUNCTION testf_bug11763507;
+
+--echo #END OF BUG#11763507 test.
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
index e86e4ef32be..1d53964a91d 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
@@ -473,6 +473,7 @@ SELECT `my.db`.f1(2);
 connection default;
 disconnect addcon;
 DROP DATABASE `my.db`;
+USE test;
 
 #
 # Restore global concurrent_insert value. Keep in the end of the test file.
@@ -483,3 +484,26 @@ set @@global.concurrent_insert= @old_concurrent_insert;
 # Wait till all disconnects are completed
 --source include/wait_until_count_sessions.inc
 
+--echo #
+--echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
+--echo #
+SET @@SQL_MODE = '';
+DELIMITER $;
+
+CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR 
+DO SELECT 1 $
+
+DELIMITER ;$
+# EVENTS
+--replace_column 6 # 7 # 8 # 9 #
+SHOW EVENTS LIKE 'teste_bug11763507';
+--replace_column 6 # 7 # 8 # 9 #
+SHOW EVENTS LIKE 'TESTE_bug11763507';
+
+--replace_column 4 # 
+SHOW CREATE EVENT teste_bug11763507;
+--replace_column 4 # 
+SHOW CREATE EVENT TESTE_bug11763507;
+
+DROP EVENT teste_bug11763507;
+--echo #END OF BUG#11763507 test.