Skip to content

Commit c32e89d

Browse files
marcalffmarcalff
committed
Merge mysql-trunk --> mysql-trunk-wl5767
2 parents 9773804 + 9680a8e commit c32e89d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1426
-1196
lines changed

‎mysql-test/extra/rpl_tests/rpl_check_gtid.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# Options:
66
# (Type of the log: binlog or relaylog)
77
# --let $binlog= <type_log>
8-
# (Check in the current log has <set_ini>-<set_end> in Previous GTids)
8+
# (Check in the current log has <set_ini>-<set_end> in Previous GTIDs)
99
# $gtid_set_ini= <set_ini>
1010
# $gtid_set_end= <set_end>
11-
# (Check in the current log has GTids from <gtid_ini> to <gtid_end>)
11+
# (Check in the current log has GTIDs from <gtid_ini> to <gtid_end>)
1212
# $gtid_ini= <gtid_ini>
1313
# $gtid_end= <gtid_end>
1414
# (Enable or disable debug)
@@ -22,7 +22,7 @@
2222
# --let $gtid_end= <gtid_end>
2323
# --source extra/rpl_tests/rpl_check_gtid.inc
2424
#
25-
# Example (Checking both Previous GTids and current Gtids in the master's
25+
# Example (Checking both Previous GTIDs and current Gtids in the master's
2626
# current binary log):
2727
# --connection master
2828
# --let $binlog= binlog
@@ -32,7 +32,7 @@
3232
# --let $gtid_end= <gtid_end>
3333
# --source extra/rpl_tests/rpl_check_gtid.inc
3434
#
35-
# Example (Checking Previous GTids in the slave's current binary log):
35+
# Example (Checking Previous GTIDs in the slave's current binary log):
3636
# --connection slave
3737
# --let $binlog= binlog
3838
# --let $gtid_set_ini= <set_ini>
@@ -41,7 +41,7 @@
4141
# --let $gtid_end=
4242
# --source extra/rpl_tests/rpl_check_gtid.inc
4343
#
44-
# Example (Checking GTids in the slave's current relay log):
44+
# Example (Checking GTIDs in the slave's current relay log):
4545
# --connection slave
4646
# --let $binlog= relaylog
4747
# --let $gtid_set_ini=

‎mysql-test/include/subquery_mat.inc‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,4 +1343,41 @@ SHOW STATUS LIKE "HANDLER_READ%";
13431343

13441344
DROP TABLE t1,t2,t3,t4;
13451345

1346+
--echo #
1347+
--echo # Bug#13727407: Assert !item->const_item() || !item->not_null_tables()
1348+
--echo #
1349+
1350+
CREATE TABLE t1 (
1351+
col_int_key INT,
1352+
KEY col_int_key (col_int_key)
1353+
);
1354+
1355+
INSERT INTO t1 VALUES (1);
1356+
1357+
CREATE TABLE t2 (
1358+
col_int_key INT,
1359+
col_time_key TIME,
1360+
col_datetime_nokey DATETIME,
1361+
KEY col_int_key (col_int_key),
1362+
KEY col_time_key (col_time_key)
1363+
);
1364+
1365+
INSERT INTO t2 VALUES
1366+
(7,'14:03:03','2001-11-28 00:50:27'), (1,'01:46:09','2007-10-09 19:53:04');
1367+
1368+
let $query=
1369+
SELECT col_datetime_nokey AS x
1370+
FROM t2 AS outr
1371+
WHERE col_int_key IN (
1372+
SELECT STRAIGHT_JOIN col_int_key
1373+
FROM t1
1374+
) AND outr.col_int_key = 0
1375+
HAVING x = '2000-09-09'
1376+
ORDER BY col_time_key;
1377+
1378+
eval EXPLAIN $query;
1379+
eval $query;
1380+
1381+
DROP TABLE t1, t2;
1382+
13461383
--echo # End of 5.6 tests

‎mysql-test/r/alter_table-big.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set debug_sync='now WAIT_FOR parked';
1414
insert into t2 values (1);
1515
insert into t1 values (1, 1, 1);;
1616
set debug_sync='now SIGNAL go';
17-
show binlog events from <binlog_start>;
17+
include/show_binlog_events.inc
1818
Log_name Pos Event_type Server_id End_log_pos Info
1919
master-bin.000001 # Query # # BEGIN
2020
master-bin.000001 # Query # # use `test`; insert into t2 values (1)
@@ -57,7 +57,7 @@ rename table t1 to t3;
5757
drop table t3;
5858
set debug_sync='alter_table_before_main_binlog SIGNAL parked WAIT_FOR go';
5959
set debug_sync='RESET';
60-
show binlog events from <binlog_start>;
60+
include/show_binlog_events.inc
6161
Log_name Pos Event_type Server_id End_log_pos Info
6262
master-bin.000001 # Query # # use `test`; alter table t1 change i c char(10) default 'Test1'
6363
master-bin.000001 # Query # # BEGIN

‎mysql-test/r/create-big.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ t2 CREATE TABLE `t2` (
186186
`i` int(11) DEFAULT NULL
187187
) ENGINE=MyISAM DEFAULT CHARSET=latin1
188188
drop table t2;
189-
show binlog events from <binlog_start>;
189+
include/show_binlog_events.inc
190190
Log_name Pos Event_type Server_id End_log_pos Info
191191
master-bin.000001 # Query # # BEGIN
192192
master-bin.000001 # Query # # use `test`; insert into t1 values (1)
@@ -214,7 +214,7 @@ drop table t1;;
214214
set debug_sync='now SIGNAL go';
215215
drop table t2;
216216
set debug_sync='RESET';
217-
show binlog events from <binlog_start>;
217+
include/show_binlog_events.inc
218218
Log_name Pos Event_type Server_id End_log_pos Info
219219
master-bin.000001 # Query # # use `test`; create table t2 like t1
220220
master-bin.000001 # Query # # BEGIN

‎mysql-test/r/ctype_cp1251.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3245,7 +3245,7 @@ Note 1003 /* select#1 */ select (v_LastPaymentDate@0 < now()) AS `v_LastPaymentD
32453245
id select_type table type possible_keys key key_len ref rows filtered Extra
32463246
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
32473247
Warnings:
3248-
Note 1003 /* select#1 */ select concat(convert(v_LastPaymentDate@0 using cp1251),now()) AS `CONCAT(v_LastPaymentDate, NOW())`
3248+
Note 1003 /* select#1 */ select concat(v_LastPaymentDate@0,now()) AS `CONCAT(v_LastPaymentDate, NOW())`
32493249
DROP PROCEDURE p1;
32503250
#
32513251
# Bug#52159 returning time type from function and empty left join causes debug assertion

‎mysql-test/r/ctype_utf8.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5099,7 +5099,7 @@ Note 1003 /* select#1 */ select (v_LastPaymentDate@0 < now()) AS `v_LastPaymentD
50995099
id select_type table type possible_keys key key_len ref rows filtered Extra
51005100
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
51015101
Warnings:
5102-
Note 1003 /* select#1 */ select concat(convert(v_LastPaymentDate@0 using utf8),now()) AS `CONCAT(v_LastPaymentDate, NOW())`
5102+
Note 1003 /* select#1 */ select concat(v_LastPaymentDate@0,now()) AS `CONCAT(v_LastPaymentDate, NOW())`
51035103
DROP PROCEDURE p1;
51045104
#
51055105
# Bug#52159 returning time type from function and empty left join causes debug assertion

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,12 @@ DROP TABLE db1.t1;
110110
DROP DATABASE db1;
111111
DROP DATABASE db2;
112112
End of 5.1 tests
113+
#
114+
# BUG#13489996 valgrind:conditional jump or move depends on
115+
# uninitialised values-field_blob
116+
#
117+
CREATE FUNCTION sf() RETURNS BLOB RETURN "";
118+
SELECT sf();
119+
sf()
120+
121+
DROP FUNCTION sf;

‎mysql-test/r/subquery_mat.result‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,5 +1774,43 @@ Handler_read_prev 0
17741774
Handler_read_rnd 0
17751775
Handler_read_rnd_next 9
17761776
DROP TABLE t1,t2,t3,t4;
1777+
#
1778+
# Bug#13727407: Assert !item->const_item() || !item->not_null_tables()
1779+
#
1780+
CREATE TABLE t1 (
1781+
col_int_key INT,
1782+
KEY col_int_key (col_int_key)
1783+
);
1784+
INSERT INTO t1 VALUES (1);
1785+
CREATE TABLE t2 (
1786+
col_int_key INT,
1787+
col_time_key TIME,
1788+
col_datetime_nokey DATETIME,
1789+
KEY col_int_key (col_int_key),
1790+
KEY col_time_key (col_time_key)
1791+
);
1792+
INSERT INTO t2 VALUES
1793+
(7,'14:03:03','2001-11-28 00:50:27'), (1,'01:46:09','2007-10-09 19:53:04');
1794+
EXPLAIN SELECT col_datetime_nokey AS x
1795+
FROM t2 AS outr
1796+
WHERE col_int_key IN (
1797+
SELECT STRAIGHT_JOIN col_int_key
1798+
FROM t1
1799+
) AND outr.col_int_key = 0
1800+
HAVING x = '2000-09-09'
1801+
ORDER BY col_time_key;
1802+
id select_type table type possible_keys key key_len ref rows Extra
1803+
1 PRIMARY outr ref col_int_key col_int_key 5 const 1 Using where; Using filesort
1804+
2 SUBQUERY t1 system NULL NULL NULL NULL 1
1805+
SELECT col_datetime_nokey AS x
1806+
FROM t2 AS outr
1807+
WHERE col_int_key IN (
1808+
SELECT STRAIGHT_JOIN col_int_key
1809+
FROM t1
1810+
) AND outr.col_int_key = 0
1811+
HAVING x = '2000-09-09'
1812+
ORDER BY col_time_key;
1813+
x
1814+
DROP TABLE t1, t2;
17771815
# End of 5.6 tests
17781816
set optimizer_switch=default;

‎mysql-test/r/subquery_mat_all.result‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,5 +1773,43 @@ Handler_read_prev 0
17731773
Handler_read_rnd 0
17741774
Handler_read_rnd_next 9
17751775
DROP TABLE t1,t2,t3,t4;
1776+
#
1777+
# Bug#13727407: Assert !item->const_item() || !item->not_null_tables()
1778+
#
1779+
CREATE TABLE t1 (
1780+
col_int_key INT,
1781+
KEY col_int_key (col_int_key)
1782+
);
1783+
INSERT INTO t1 VALUES (1);
1784+
CREATE TABLE t2 (
1785+
col_int_key INT,
1786+
col_time_key TIME,
1787+
col_datetime_nokey DATETIME,
1788+
KEY col_int_key (col_int_key),
1789+
KEY col_time_key (col_time_key)
1790+
);
1791+
INSERT INTO t2 VALUES
1792+
(7,'14:03:03','2001-11-28 00:50:27'), (1,'01:46:09','2007-10-09 19:53:04');
1793+
EXPLAIN SELECT col_datetime_nokey AS x
1794+
FROM t2 AS outr
1795+
WHERE col_int_key IN (
1796+
SELECT STRAIGHT_JOIN col_int_key
1797+
FROM t1
1798+
) AND outr.col_int_key = 0
1799+
HAVING x = '2000-09-09'
1800+
ORDER BY col_time_key;
1801+
id select_type table type possible_keys key key_len ref rows Extra
1802+
1 PRIMARY outr ref col_int_key col_int_key 5 const 1 Using where; Using filesort
1803+
2 SUBQUERY t1 system NULL NULL NULL NULL 1
1804+
SELECT col_datetime_nokey AS x
1805+
FROM t2 AS outr
1806+
WHERE col_int_key IN (
1807+
SELECT STRAIGHT_JOIN col_int_key
1808+
FROM t1
1809+
) AND outr.col_int_key = 0
1810+
HAVING x = '2000-09-09'
1811+
ORDER BY col_time_key;
1812+
x
1813+
DROP TABLE t1, t2;
17761814
# End of 5.6 tests
17771815
set optimizer_switch=default;

‎mysql-test/r/subquery_mat_none.result‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,5 +1771,43 @@ Handler_read_prev 0
17711771
Handler_read_rnd 0
17721772
Handler_read_rnd_next 3
17731773
DROP TABLE t1,t2,t3,t4;
1774+
#
1775+
# Bug#13727407: Assert !item->const_item() || !item->not_null_tables()
1776+
#
1777+
CREATE TABLE t1 (
1778+
col_int_key INT,
1779+
KEY col_int_key (col_int_key)
1780+
);
1781+
INSERT INTO t1 VALUES (1);
1782+
CREATE TABLE t2 (
1783+
col_int_key INT,
1784+
col_time_key TIME,
1785+
col_datetime_nokey DATETIME,
1786+
KEY col_int_key (col_int_key),
1787+
KEY col_time_key (col_time_key)
1788+
);
1789+
INSERT INTO t2 VALUES
1790+
(7,'14:03:03','2001-11-28 00:50:27'), (1,'01:46:09','2007-10-09 19:53:04');
1791+
EXPLAIN SELECT col_datetime_nokey AS x
1792+
FROM t2 AS outr
1793+
WHERE col_int_key IN (
1794+
SELECT STRAIGHT_JOIN col_int_key
1795+
FROM t1
1796+
) AND outr.col_int_key = 0
1797+
HAVING x = '2000-09-09'
1798+
ORDER BY col_time_key;
1799+
id select_type table type possible_keys key key_len ref rows Extra
1800+
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
1801+
2 DEPENDENT SUBQUERY t1 system col_int_key NULL NULL NULL 1
1802+
SELECT col_datetime_nokey AS x
1803+
FROM t2 AS outr
1804+
WHERE col_int_key IN (
1805+
SELECT STRAIGHT_JOIN col_int_key
1806+
FROM t1
1807+
) AND outr.col_int_key = 0
1808+
HAVING x = '2000-09-09'
1809+
ORDER BY col_time_key;
1810+
x
1811+
DROP TABLE t1, t2;
17741812
# End of 5.6 tests
17751813
set optimizer_switch=default;

0 commit comments

Comments
 (0)