Skip to content

Commit f96763f

Browse files
Alexey KopytovAlexey Kopytov
Alexey Kopytov
authored and
Alexey Kopytov
committed
Automerge of mysql-5.1-bugteam to mysql-trunk-merge.
--BZR-- revision-id: [email protected] property-branch-nick: mysql-trunk-merge testament3-sha1: 3c17f58a85f2ec6455172ab0f774172763a7a09e
2 parents 0fc09fe + dc95982 commit f96763f

22 files changed

Lines changed: 221 additions & 18 deletions

‎include/my_global.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
858858
#endif
859859

860860
#ifndef OS_FILE_LIMIT
861-
#define OS_FILE_LIMIT 65535
861+
#define OS_FILE_LIMIT UINT_MAX
862862
#endif
863863

864864
/* #define EXT_IN_LIBNAME */

‎mysql-test/r/ctype_ucs.result‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,14 @@ SELECT HEX(DAYNAME(19700101));
12301230
HEX(DAYNAME(19700101))
12311231
0427043504420432043504400433
12321232
SET character_set_connection=latin1;
1233+
#
1234+
# Bug#52120 create view cause Assertion failed: 0, file .\item_subselect.cc, line 817
1235+
#
1236+
CREATE TABLE t1 (a CHAR(1) CHARSET ascii, b CHAR(1) CHARSET latin1);
1237+
CREATE VIEW v1 AS SELECT 1 from t1
1238+
WHERE t1.b <=> (SELECT a FROM t1 WHERE a < SOME(SELECT '1'));
1239+
DROP VIEW v1;
1240+
DROP TABLE t1;
12331241
End of 5.0 tests
12341242
#
12351243
# Start of 5.5 tests

‎mysql-test/r/func_concat.result‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,22 @@ SELECT @query;
130130
@query
131131
abcde,0,1234
132132
DROP PROCEDURE p1;
133+
#
134+
# Bug #40625: Concat fails on DOUBLE values in a Stored Procedure,
135+
# while DECIMAL works
136+
#
137+
CREATE PROCEDURE p1()
138+
BEGIN
139+
DECLARE v1 DOUBLE(10,3);
140+
SET v1= 100;
141+
SET @s = CONCAT('########################################', 40 , v1);
142+
SELECT @s;
143+
END;//
144+
CALL p1();
145+
@s
146+
########################################40100.000
147+
CALL p1();
148+
@s
149+
########################################40100.000
150+
DROP PROCEDURE p1;
133151
# End of 5.1 tests

‎mysql-test/r/having.result‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ HAVING (table2.f2 = 8 AND table1.f1 >= 6);
472472
id select_type table type possible_keys key key_len ref rows filtered Extra
473473
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING noticed after reading const tables
474474
Warnings:
475-
Note 1003 select `test`.`table1`.`f1` AS `f1`,'7' AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where ((`test`.`table1`.`f3` = '9')) group by `test`.`table1`.`f1`,'7' having (('7' = 8) and (`test`.`table1`.`f1` >= 6))
475+
Note 1003 select `test`.`table1`.`f1` AS `f1`,'7' AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where ((`test`.`table1`.`f3` = '9')) group by `test`.`table1`.`f1`,'7' having 0
476476
EXPLAIN EXTENDED
477477
SELECT table1.f1, table2.f2
478478
FROM t1 AS table1
@@ -483,6 +483,50 @@ HAVING (table2.f2 = 8);
483483
id select_type table type possible_keys key key_len ref rows filtered Extra
484484
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible HAVING noticed after reading const tables
485485
Warnings:
486-
Note 1003 select `test`.`table1`.`f1` AS `f1`,'7' AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where ((`test`.`table1`.`f3` = '9')) group by `test`.`table1`.`f1`,'7' having ('7' = 8)
486+
Note 1003 select `test`.`table1`.`f1` AS `f1`,'7' AS `f2` from `test`.`t1` `table1` join `test`.`t1` `table2` where ((`test`.`table1`.`f3` = '9')) group by `test`.`table1`.`f1`,'7' having 0
487487
DROP TABLE t1;
488+
#
489+
# Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355
490+
#
491+
CREATE TABLE t1(f1 INT, f2 INT);
492+
INSERT INTO t1 VALUES (10,8);
493+
CREATE TABLE t2 (f1 INT);
494+
INSERT INTO t2 VALUES (5);
495+
SELECT COUNT(f1) FROM t2
496+
HAVING (7, 9) IN (SELECT f1, MIN(f2) FROM t1);
497+
COUNT(f1)
498+
DROP TABLE t1, t2;
499+
CREATE TABLE t1 (f1 INT, f2 VARCHAR(1));
500+
INSERT INTO t1 VALUES (16,'f');
501+
INSERT INTO t1 VALUES (16,'f');
502+
CREATE TABLE t2 (f1 INT, f2 VARCHAR(1));
503+
INSERT INTO t2 VALUES (13,'f');
504+
INSERT INTO t2 VALUES (20,'f');
505+
CREATE TABLE t3 (f1 INT, f2 VARCHAR(1));
506+
INSERT INTO t3 VALUES (7,'f');
507+
SELECT t1.f2 FROM t1
508+
STRAIGHT_JOIN (t2 JOIN t3 ON t3.f2 = t2.f2 ) ON t3 .f2 = t2 .f2
509+
HAVING ('v', 'i') NOT IN (SELECT f2, MIN(f2) FROM t1)
510+
ORDER BY f2;
511+
f2
512+
f
513+
f
514+
f
515+
f
516+
DROP TABLES t1,t2,t3;
517+
#
518+
# Bug#52340 Segfault: read_cached_record (tab=0x94a2634) at sql_select.cc:14411
519+
#
520+
CREATE TABLE t1 (f1 INT, f2 VARCHAR(1));
521+
INSERT INTO t1 VALUES (16,'d');
522+
CREATE TABLE t2 (f1 INT, f2 VARCHAR(1));
523+
INSERT INTO t2 VALUES (13,'e');
524+
INSERT INTO t2 VALUES (20,'d');
525+
SELECT MAX(t2.f2) FROM t2 JOIN t1 ON t1.f2
526+
HAVING ('e' , 'd') IN
527+
(SELECT ts1.f2, ts2.f2 FROM t2 ts1 JOIN t2 ts2 ON ts1.f1)
528+
ORDER BY t1.f2;
529+
MAX(t2.f2)
530+
NULL
531+
DROP TABLE t1,t2;
488532
End of 5.0 tests

‎mysql-test/r/view.result‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3986,6 +3986,14 @@ CREATE VIEW v1 AS SELECT 1 FROM t1 WHERE
39863986
ROW(1,1) >= ROW(1, (SELECT 1 FROM t1 WHERE f1 >= ANY ( SELECT '1' )));
39873987
DROP VIEW v1;
39883988
DROP TABLE t1;
3989+
#
3990+
# Bug#52120 create view cause Assertion failed: 0, file .\item_subselect.cc, line 817
3991+
#
3992+
CREATE TABLE t1 (a CHAR(1) CHARSET latin1, b CHAR(1) CHARSET utf8);
3993+
CREATE VIEW v1 AS SELECT 1 from t1
3994+
WHERE t1.b <=> (SELECT a FROM t1 WHERE a < SOME(SELECT '1'));
3995+
DROP VIEW v1;
3996+
DROP TABLE t1;
39893997
# -----------------------------------------------------------------
39903998
# -- End of 5.1 tests.
39913999
# -----------------------------------------------------------------

‎mysql-test/suite/engines/funcs/t/disabled.def‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# List of disabled tests
22
# test name : comment
3-
#rpl_redirect : Fails due to bug#49978
3+
rpl_redirect : Fails due to bug#49978
4+
crash_manycolumns_string : Bug#50495 'Row size too large' for plugin, but works for built-in innodb
5+
ix_unique_lob : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
6+
ix_unique_string_length : Bug#52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value
7+

‎mysql-test/suite/engines/iuds/r/insert_year.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ c1 c2 c3 c4
986986
2155 2155 1998-12-26 1998-12-26 11:30:45
987987
SELECT count(*) as total_rows, min(c2) as min_value, max(c2) FROM t2;
988988
total_rows min_value max(c2)
989-
20 1901 2155
989+
20 0 2155
990990
SELECT * FROM t2 WHERE c3 = '1998-12-11';
991991
c1 c2 c3 c4
992992
1990 1990 1998-12-11 1998-12-11 11:30:45
@@ -1400,7 +1400,7 @@ c1 c2 c3 c4
14001400
2155 2155 1998-12-26 1998-12-26 11:30:45
14011401
SELECT count(*) as total_rows, min(c2) as min_value, max(c2) FROM t2;
14021402
total_rows min_value max(c2)
1403-
20 1901 2155
1403+
20 0 2155
14041404
SELECT * FROM t2 WHERE c3 = '1998-12-11';
14051405
c1 c2 c3 c4
14061406
1990 1990 1998-12-11 1998-12-11 11:30:45

‎mysql-test/suite/engines/iuds/r/update_delete_calendar.result‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,9 +791,6 @@ Warning 1292 Truncated incorrect datetime value: '2009-01-10 23:60:59'
791791
SELECT count(*) FROM t1 WHERE c2='2001-01-11 23:59:60' /* returns 0 */;
792792
count(*)
793793
0
794-
Warnings:
795-
Warning 1292 Incorrect datetime value: '2001-01-11 23:59:60' for column 'c2' at row 1
796-
Warning 1292 Incorrect datetime value: '2001-01-11 23:59:60' for column 'c2' at row 1
797794
SELECT * FROM t1 WHERE c1='0000-00-00 00:00:00' OR c2='0000-00-00 00:00:00';
798795
c1 c2 c3
799796
0000-00-00 00:00:00 0000-00-00 00:00:00 6

‎mysql-test/suite/engines/iuds/t/disabled.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
insert_calendar : Bug #52283 Innodb reports extra warnings when SELECT/WHERE is performed using invalid value

‎mysql-test/suite/engines/iuds/t/insert_number.test‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7812,10 +7812,15 @@ SELECT * FROM t2 ORDER BY c1,c6 LIMIT 2;
78127812
SELECT * FROM t2 ORDER BY c1,c6 DESC LIMIT 2;
78137813

78147814
## ref type access
7815+
7816+
# Bug#52283 : Remove the following --disable_warnings
7817+
# command when the bug is fixed
7818+
--disable_warnings
78157819
SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6;
78167820
SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6 LIMIT 2;
78177821
SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6 DESC;
78187822
SELECT * FROM t2 WHERE c1 = 18446744073709551616 ORDER BY c1,c6 DESC LIMIT 2;
7823+
--enable_warnings
78197824

78207825
## Range access, ordered ##
78217826
SELECT * FROM t2 WHERE c1 <> 18446744073709551616 ORDER BY c1,c6;

0 commit comments

Comments
 (0)