Skip to content

Commit 86ad81b

Browse files
phulakunphulakun
committed
Merge from 5.1 to 5.5
2 parents fc52012 + 19c375c commit 86ad81b

File tree

6 files changed

+106
-48
lines changed

6 files changed

+106
-48
lines changed

‎mysql-test/r/sp-bugs.result

-27
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ BEGIN
147147
SELECT "PROCEDURE testp_bug11763507";
148148
END
149149
$
150-
CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
151-
DO SELECT 1 $
152150
SELECT testf_bug11763507();
153151
testf_bug11763507()
154152
0
@@ -179,12 +177,6 @@ testf_bug11763507 CREATE DEFINER=`root`@`localhost` FUNCTION `testf_bug11763507
179177
BEGIN
180178
RETURN 0;
181179
END latin1 latin1_swedish_ci latin1_swedish_ci
182-
SHOW FUNCTION CODE testf_bug11763507;
183-
Pos Instruction
184-
0 freturn 3 0
185-
SHOW FUNCTION CODE TESTF_bug11763507;
186-
Pos Instruction
187-
0 freturn 3 0
188180
CALL testp_bug11763507();
189181
PROCEDURE testp_bug11763507
190182
PROCEDURE testp_bug11763507
@@ -215,24 +207,6 @@ testp_bug11763507 CREATE DEFINER=`root`@`localhost` PROCEDURE `testp_bug1176350
215207
BEGIN
216208
SELECT "PROCEDURE testp_bug11763507";
217209
END latin1 latin1_swedish_ci latin1_swedish_ci
218-
SHOW PROCEDURE CODE testp_bug11763507;
219-
Pos Instruction
220-
0 stmt 0 "SELECT "PROCEDURE testp_bug11763507""
221-
SHOW PROCEDURE CODE TESTP_bug11763507;
222-
Pos Instruction
223-
0 stmt 0 "SELECT "PROCEDURE testp_bug11763507""
224-
SHOW EVENTS LIKE 'teste_bug11763507';
225-
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
226-
test teste_bug11763507 root@localhost SYSTEM ONE TIME # # # # NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
227-
SHOW EVENTS LIKE 'TESTE_bug11763507';
228-
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
229-
test teste_bug11763507 root@localhost SYSTEM ONE TIME # # # # NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
230-
SHOW CREATE EVENT teste_bug11763507;
231-
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
232-
teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci
233-
SHOW CREATE EVENT TESTE_bug11763507;
234-
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
235-
teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci
236210
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'testf_bug11763507';
237211
specific_name
238212
testf_bug11763507
@@ -245,7 +219,6 @@ testf_bug11763507
245219
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='TESTF_bug11763507';
246220
specific_name
247221
testf_bug11763507
248-
DROP EVENT teste_bug11763507;
249222
DROP PROCEDURE testp_bug11763507;
250223
DROP FUNCTION testf_bug11763507;
251224
#END OF BUG#11763507 test.

‎mysql-test/r/sp-code.result

+29
Original file line numberDiff line numberDiff line change
@@ -945,3 +945,32 @@ Error 1329 No data - zero rows fetched, selected, or processed
945945
SET SESSION debug="-d,bug23032_emit_warning";
946946
DROP PROCEDURE p1;
947947
DROP TABLE t1;
948+
#
949+
# Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
950+
#
951+
SET @@SQL_MODE = '';
952+
CREATE FUNCTION testf_bug11763507() RETURNS INT
953+
BEGIN
954+
RETURN 0;
955+
END
956+
$
957+
CREATE PROCEDURE testp_bug11763507()
958+
BEGIN
959+
SELECT "PROCEDURE testp_bug11763507";
960+
END
961+
$
962+
SHOW FUNCTION CODE testf_bug11763507;
963+
Pos Instruction
964+
0 freturn 3 0
965+
SHOW FUNCTION CODE TESTF_bug11763507;
966+
Pos Instruction
967+
0 freturn 3 0
968+
SHOW PROCEDURE CODE testp_bug11763507;
969+
Pos Instruction
970+
0 stmt 0 "SELECT "PROCEDURE testp_bug11763507""
971+
SHOW PROCEDURE CODE TESTP_bug11763507;
972+
Pos Instruction
973+
0 stmt 0 "SELECT "PROCEDURE testp_bug11763507""
974+
DROP PROCEDURE testp_bug11763507;
975+
DROP FUNCTION testf_bug11763507;
976+
#END OF BUG#11763507 test.

‎mysql-test/r/sp_notembedded.result

+21
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,25 @@ SELECT `my.db`.f1(2);
308308
2
309309
# Switching to default connection.
310310
DROP DATABASE `my.db`;
311+
USE test;
311312
set @@global.concurrent_insert= @old_concurrent_insert;
313+
#
314+
# Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
315+
#
316+
SET @@SQL_MODE = '';
317+
CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
318+
DO SELECT 1 $
319+
SHOW EVENTS LIKE 'teste_bug11763507';
320+
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
321+
test teste_bug11763507 root@localhost SYSTEM ONE TIME # # # # NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
322+
SHOW EVENTS LIKE 'TESTE_bug11763507';
323+
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
324+
test teste_bug11763507 root@localhost SYSTEM ONE TIME # # # # NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
325+
SHOW CREATE EVENT teste_bug11763507;
326+
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
327+
teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci
328+
SHOW CREATE EVENT TESTE_bug11763507;
329+
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
330+
teste_bug11763507 SYSTEM # latin1 latin1_swedish_ci latin1_swedish_ci
331+
DROP EVENT teste_bug11763507;
332+
#END OF BUG#11763507 test.

‎mysql-test/t/sp-bugs.test

-21
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ BEGIN
183183
END
184184
$
185185

186-
CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
187-
DO SELECT 1 $
188-
189186
DELIMITER ;$
190187

191188
# STORED FUNCTIONS
@@ -204,9 +201,6 @@ SHOW FUNCTION STATUS WHERE NAME='TESTF_bug11763507';
204201
SHOW CREATE FUNCTION testf_bug11763507;
205202
SHOW CREATE FUNCTION TESTF_bug11763507;
206203

207-
SHOW FUNCTION CODE testf_bug11763507;
208-
SHOW FUNCTION CODE TESTF_bug11763507;
209-
210204
# STORED PROCEDURE
211205
CALL testp_bug11763507();
212206
CALL TESTP_bug11763507();
@@ -223,28 +217,13 @@ SHOW PROCEDURE STATUS WHERE NAME='TESTP_bug11763507';
223217
SHOW CREATE PROCEDURE testp_bug11763507;
224218
SHOW CREATE PROCEDURE TESTP_bug11763507;
225219

226-
SHOW PROCEDURE CODE testp_bug11763507;
227-
SHOW PROCEDURE CODE TESTP_bug11763507;
228-
229-
# EVENTS
230-
--replace_column 6 # 7 # 8 # 9 #
231-
SHOW EVENTS LIKE 'teste_bug11763507';
232-
--replace_column 6 # 7 # 8 # 9 #
233-
SHOW EVENTS LIKE 'TESTE_bug11763507';
234-
235-
--replace_column 4 #
236-
SHOW CREATE EVENT teste_bug11763507;
237-
--replace_column 4 #
238-
SHOW CREATE EVENT TESTE_bug11763507;
239-
240220
# INFORMATION SCHEMA
241221
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'testf_bug11763507';
242222
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name LIKE 'TESTF_bug11763507';
243223

244224
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='testf_bug11763507';
245225
SELECT specific_name FROM INFORMATION_SCHEMA.ROUTINES WHERE specific_name='TESTF_bug11763507';
246226

247-
DROP EVENT teste_bug11763507;
248227
DROP PROCEDURE testp_bug11763507;
249228
DROP FUNCTION testf_bug11763507;
250229

‎mysql-test/t/sp-code.test

+32
Original file line numberDiff line numberDiff line change
@@ -702,3 +702,35 @@ SET SESSION debug="-d,bug23032_emit_warning";
702702

703703
DROP PROCEDURE p1;
704704
DROP TABLE t1;
705+
706+
--echo #
707+
--echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
708+
--echo #
709+
SET @@SQL_MODE = '';
710+
DELIMITER $;
711+
CREATE FUNCTION testf_bug11763507() RETURNS INT
712+
BEGIN
713+
RETURN 0;
714+
END
715+
$
716+
717+
CREATE PROCEDURE testp_bug11763507()
718+
BEGIN
719+
SELECT "PROCEDURE testp_bug11763507";
720+
END
721+
$
722+
723+
DELIMITER ;$
724+
725+
# STORED FUNCTIONS
726+
SHOW FUNCTION CODE testf_bug11763507;
727+
SHOW FUNCTION CODE TESTF_bug11763507;
728+
729+
# STORED PROCEDURE
730+
SHOW PROCEDURE CODE testp_bug11763507;
731+
SHOW PROCEDURE CODE TESTP_bug11763507;
732+
733+
DROP PROCEDURE testp_bug11763507;
734+
DROP FUNCTION testf_bug11763507;
735+
736+
--echo #END OF BUG#11763507 test.

‎mysql-test/t/sp_notembedded.test

+24
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ SELECT `my.db`.f1(2);
473473
connection default;
474474
disconnect addcon;
475475
DROP DATABASE `my.db`;
476+
USE test;
476477

477478
#
478479
# Restore global concurrent_insert value. Keep in the end of the test file.
@@ -483,3 +484,26 @@ set @@global.concurrent_insert= @old_concurrent_insert;
483484
# Wait till all disconnects are completed
484485
--source include/wait_until_count_sessions.inc
485486

487+
--echo #
488+
--echo # Bug#11763507 - 56224: FUNCTION NAME IS CASE-SENSITIVE
489+
--echo #
490+
SET @@SQL_MODE = '';
491+
DELIMITER $;
492+
493+
CREATE EVENT teste_bug11763507 ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR
494+
DO SELECT 1 $
495+
496+
DELIMITER ;$
497+
# EVENTS
498+
--replace_column 6 # 7 # 8 # 9 #
499+
SHOW EVENTS LIKE 'teste_bug11763507';
500+
--replace_column 6 # 7 # 8 # 9 #
501+
SHOW EVENTS LIKE 'TESTE_bug11763507';
502+
503+
--replace_column 4 #
504+
SHOW CREATE EVENT teste_bug11763507;
505+
--replace_column 4 #
506+
SHOW CREATE EVENT TESTE_bug11763507;
507+
508+
DROP EVENT teste_bug11763507;
509+
--echo #END OF BUG#11763507 test.

0 commit comments

Comments
 (0)