mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 5.5->10.0-base
This commit is contained in:
Igor Babaev
@ -2215,6 +2215,35 @@ DROP VIEW v1;
|
||||
DROP TABLE t1,t2;
|
||||
set optimizer_switch=@save_optimizer_switch;
|
||||
#
|
||||
# mdev-5078: sum over a view/derived table
|
||||
#
|
||||
CREATE TABLE t1 (a int);
|
||||
INSERT INTO t1 (a) VALUES (1), (2);
|
||||
CREATE TABLE t2 (b int(11));
|
||||
INSERT INTO t2 (b) VALUES (1), (2);
|
||||
CREATE VIEW v AS SELECT b as c FROM t2;
|
||||
SELECT a, (SELECT SUM(a + c) FROM v) FROM t1;
|
||||
a (SELECT SUM(a + c) FROM v)
|
||||
1 5
|
||||
2 7
|
||||
SELECT a, (SELECT SUM(a + c) FROM (SELECT b as c FROM t2) AS v1) FROM t1;
|
||||
a (SELECT SUM(a + c) FROM (SELECT b as c FROM t2) AS v1)
|
||||
1 5
|
||||
2 7
|
||||
DROP VIEW v;
|
||||
DROP TABLE t1,t2;
|
||||
#
|
||||
# mdev-5105: memory overwrite in multi-table update
|
||||
# using natuaral join with a view
|
||||
#
|
||||
create table t1(a int,b tinyint,c tinyint)engine=myisam;
|
||||
create table t2(a tinyint,b float,c int, d int, e int, f int, key (b), key(c), key(d), key(e), key(f))engine=myisam;
|
||||
create table t3(a int,b int,c int, d int, e int, f int, key(a), key(b), key(c), key(d), key(e), key(f))engine=myisam;
|
||||
create view v1 as select t2.b a, t1.b b, t2.c c, t2.d d, t2.e e, t2.f f from t1,t2 where t1.a=t2.a;
|
||||
update t3 natural join v1 set a:=1;
|
||||
drop view v1;
|
||||
drop table t1,t2,t3;
|
||||
#
|
||||
# end of 5.3 tests
|
||||
#
|
||||
set optimizer_switch=@exit_optimizer_switch;
|
||||
|
||||
@ -879,6 +879,116 @@ NULL
|
||||
7
|
||||
drop view v;
|
||||
drop table t1, t2;
|
||||
CREATE TABLE t1 (
|
||||
id int, i1 int, i2 int DEFAULT 0,
|
||||
d1 date DEFAULT '2000-01-01', d2 date DEFAULT '2000-01-01',
|
||||
t1 time DEFAULT '00:00:00', t2 time DEFAULT '00:00:00',
|
||||
dt1 datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
|
||||
dt2 datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
|
||||
c1 varchar(1) NOT NULL, c2 varchar(1) NOT NULL
|
||||
) ENGINE=MyISAM;
|
||||
CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1;
|
||||
INSERT INTO t1 (id,i1,c1,c2) VALUES
|
||||
(1,7,'t','t'),(2,4,'k','k'),(3,2,'e','e'),(4,0,'i','i'),(5,1,'t','t'),(6,91,'m','m'),
|
||||
(7,6,'z','z'),(8,3,'c','c'),(9,6,'i','i'),(10,8,'v','v'), (11,1,'l','l'),(12,4,'j','j'),
|
||||
(13,5,'w','w'),(14,0,'r','r'),(15,7,'o','o'),(16,9,'o','o'),(17,7,'u','u'),(18,6,'f','f'),
|
||||
(19,0,'l','l'),(20,6,'g','g'),(21,1,'e','e'),(22,7,'y','y'),(23,0,'p','p'),(24,6,'v','v'),
|
||||
(25,5,'d','d'),(26,9,'i','i'),(27,5,'z','z'),(28,2,'q','q'),(29,4,'j','j'),(30,9,'m','m'),
|
||||
(31,8,'d','d'),(32,5,'r','r'),(33,1,'r','r'),(34,1,'k','k'),(35,4,'p','p'),(36,2,'x','x'),
|
||||
(37,5,'w','w'),(38,0,'k','k'),(39,7,'y','y'),(40,4,'p','p'),(41,9,'l','l'),(42,2,'u','u'),
|
||||
(43,3,'r','r'),(44,5,'y','y'),(45,3,'u','u'),(46,9,'t','t'),(47,8,'f','f'),(48,2,'f','f'),
|
||||
(49,2,'q','q'),(50,6,'v','v'),(51,6,'u','u'),(52,0,'b','b'),(53,1,'n','n'),(54,2,'p','p'),
|
||||
(55,0,'y','y'),(56,1,'l','l'),(57,1,'c','c'),(58,0,'d','d'),(59,2,'y','y'),(60,7,'l','l'),
|
||||
(61,6,'m','m'),(62,9,'q','q'),(63,0,'j','j'),(64,3,'u','u'),(65,4,'w','w'),(66,5,'p','p'),
|
||||
(67,8,'z','z'),(68,5,'u','u'),(69,7,'b','b'),(70,0,'f','f'),(71,6,'u','u'),(72,1,'i','i'),
|
||||
(73,9,'s','s'),(74,3,'y','y'),(75,5,'s','s'),(76,8,'x','x'),(77,3,'s','s'),(78,3,'l','l'),
|
||||
(79,8,'b','b'),(80,0,'p','p'),(81,9,'m','m'),(82,5,'k','k'),(83,7,'u','u'),(84,0,'y','y'),
|
||||
(85,2,'x','x'),(86,5,'h','h'),(87,5,'j','j'),(88,5,'o','o'),(89,9,'o','o'),(90,1,'c','c'),
|
||||
(91,7,'k','k'),(92,9,'t','t'),(93,3,'h','h'),(94,6,'g','g'),(95,9,'r','r'),(96,2,'i','i');
|
||||
CREATE TABLE t2 (i INT) ENGINE=MyISAM;
|
||||
INSERT INTO t2 VALUES (7),(8);
|
||||
SELECT STRAIGHT_JOIN COUNT(DISTINCT t1.id) FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
COUNT(DISTINCT t1.id)
|
||||
18
|
||||
EXPLAIN EXTENDED
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
id select_type table type possible_keys key key_len ref rows filtered Extra
|
||||
1 PRIMARY t1 ALL NULL NULL NULL NULL 96 100.00 Using where; Using temporary
|
||||
1 PRIMARY <derived2> ref key0 key0 5 test.t1.i1 9 100.00 Using where; Distinct
|
||||
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 Using where; Distinct; Using join buffer (flat, BNL join)
|
||||
2 DERIVED t1 ALL NULL NULL NULL NULL 96 100.00
|
||||
Warnings:
|
||||
Note 1003 select straight_join distinct `test`.`t1`.`id` AS `id` from `test`.`t1` join `test`.`v1` join `test`.`t2` where ((`test`.`t2`.`i` = `v1`.`id`) and (`v1`.`i1` = `test`.`t1`.`i1`) and (`v1`.`id` <> 3))
|
||||
set join_buffer_size=1024;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
id
|
||||
7
|
||||
8
|
||||
9
|
||||
18
|
||||
20
|
||||
24
|
||||
43
|
||||
45
|
||||
50
|
||||
51
|
||||
61
|
||||
64
|
||||
71
|
||||
74
|
||||
77
|
||||
78
|
||||
93
|
||||
94
|
||||
set join_buffer_size=1024*16;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
id
|
||||
7
|
||||
9
|
||||
18
|
||||
20
|
||||
24
|
||||
8
|
||||
50
|
||||
51
|
||||
61
|
||||
43
|
||||
45
|
||||
71
|
||||
64
|
||||
74
|
||||
77
|
||||
78
|
||||
94
|
||||
93
|
||||
set join_buffer_size=default;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
id
|
||||
7
|
||||
9
|
||||
18
|
||||
20
|
||||
24
|
||||
50
|
||||
51
|
||||
61
|
||||
71
|
||||
94
|
||||
8
|
||||
43
|
||||
45
|
||||
64
|
||||
74
|
||||
77
|
||||
78
|
||||
93
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1,t2;
|
||||
#
|
||||
# Bug #11744875: 4082: integer lengths cause truncation with distinct concat and innodb
|
||||
#
|
||||
|
||||
@ -373,3 +373,12 @@ id select_type table type possible_keys key key_len ref rows Extra
|
||||
SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
|
||||
dt
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# Bug mdev-5132: crash when exeicuting a join query
|
||||
# with IS NULL and IS NOT NULL in where
|
||||
#
|
||||
CREATE TABLE t1 (a DATE, b INT, c INT, KEY(a), KEY(b), KEY(c)) ENGINE=MyISAM;
|
||||
CREATE TABLE t2 (d DATE) ENGINE=MyISAM;
|
||||
SELECT * FROM t1,t2 WHERE 1 IS NOT NULL AND t1.b IS NULL;
|
||||
a b c d
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
@ -1545,6 +1545,39 @@ DROP TABLE t1,t2;
|
||||
set optimizer_switch=@save_optimizer_switch;
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # mdev-5078: sum over a view/derived table
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (a int);
|
||||
INSERT INTO t1 (a) VALUES (1), (2);
|
||||
|
||||
CREATE TABLE t2 (b int(11));
|
||||
INSERT INTO t2 (b) VALUES (1), (2);
|
||||
|
||||
CREATE VIEW v AS SELECT b as c FROM t2;
|
||||
|
||||
SELECT a, (SELECT SUM(a + c) FROM v) FROM t1;
|
||||
|
||||
SELECT a, (SELECT SUM(a + c) FROM (SELECT b as c FROM t2) AS v1) FROM t1;
|
||||
|
||||
DROP VIEW v;
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # mdev-5105: memory overwrite in multi-table update
|
||||
--echo # using natuaral join with a view
|
||||
--echo #
|
||||
|
||||
create table t1(a int,b tinyint,c tinyint)engine=myisam;
|
||||
create table t2(a tinyint,b float,c int, d int, e int, f int, key (b), key(c), key(d), key(e), key(f))engine=myisam;
|
||||
create table t3(a int,b int,c int, d int, e int, f int, key(a), key(b), key(c), key(d), key(e), key(f))engine=myisam;
|
||||
create view v1 as select t2.b a, t1.b b, t2.c c, t2.d d, t2.e e, t2.f f from t1,t2 where t1.a=t2.a;
|
||||
|
||||
update t3 natural join v1 set a:=1;
|
||||
drop view v1;
|
||||
drop table t1,t2,t3;
|
||||
|
||||
--echo #
|
||||
--echo # end of 5.3 tests
|
||||
--echo #
|
||||
|
||||
@ -683,6 +683,64 @@ select distinct (select max(a) from t1 where alias.b = a) as field1 from t2 as a
|
||||
drop view v;
|
||||
drop table t1, t2;
|
||||
|
||||
#
|
||||
# Bug mdev-5028: invalid distinct optimization when join buffer is used
|
||||
#
|
||||
|
||||
CREATE TABLE t1 (
|
||||
id int, i1 int, i2 int DEFAULT 0,
|
||||
d1 date DEFAULT '2000-01-01', d2 date DEFAULT '2000-01-01',
|
||||
t1 time DEFAULT '00:00:00', t2 time DEFAULT '00:00:00',
|
||||
dt1 datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
|
||||
dt2 datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
|
||||
c1 varchar(1) NOT NULL, c2 varchar(1) NOT NULL
|
||||
) ENGINE=MyISAM;
|
||||
|
||||
CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1;
|
||||
|
||||
INSERT INTO t1 (id,i1,c1,c2) VALUES
|
||||
(1,7,'t','t'),(2,4,'k','k'),(3,2,'e','e'),(4,0,'i','i'),(5,1,'t','t'),(6,91,'m','m'),
|
||||
(7,6,'z','z'),(8,3,'c','c'),(9,6,'i','i'),(10,8,'v','v'), (11,1,'l','l'),(12,4,'j','j'),
|
||||
(13,5,'w','w'),(14,0,'r','r'),(15,7,'o','o'),(16,9,'o','o'),(17,7,'u','u'),(18,6,'f','f'),
|
||||
(19,0,'l','l'),(20,6,'g','g'),(21,1,'e','e'),(22,7,'y','y'),(23,0,'p','p'),(24,6,'v','v'),
|
||||
(25,5,'d','d'),(26,9,'i','i'),(27,5,'z','z'),(28,2,'q','q'),(29,4,'j','j'),(30,9,'m','m'),
|
||||
(31,8,'d','d'),(32,5,'r','r'),(33,1,'r','r'),(34,1,'k','k'),(35,4,'p','p'),(36,2,'x','x'),
|
||||
(37,5,'w','w'),(38,0,'k','k'),(39,7,'y','y'),(40,4,'p','p'),(41,9,'l','l'),(42,2,'u','u'),
|
||||
(43,3,'r','r'),(44,5,'y','y'),(45,3,'u','u'),(46,9,'t','t'),(47,8,'f','f'),(48,2,'f','f'),
|
||||
(49,2,'q','q'),(50,6,'v','v'),(51,6,'u','u'),(52,0,'b','b'),(53,1,'n','n'),(54,2,'p','p'),
|
||||
(55,0,'y','y'),(56,1,'l','l'),(57,1,'c','c'),(58,0,'d','d'),(59,2,'y','y'),(60,7,'l','l'),
|
||||
(61,6,'m','m'),(62,9,'q','q'),(63,0,'j','j'),(64,3,'u','u'),(65,4,'w','w'),(66,5,'p','p'),
|
||||
(67,8,'z','z'),(68,5,'u','u'),(69,7,'b','b'),(70,0,'f','f'),(71,6,'u','u'),(72,1,'i','i'),
|
||||
(73,9,'s','s'),(74,3,'y','y'),(75,5,'s','s'),(76,8,'x','x'),(77,3,'s','s'),(78,3,'l','l'),
|
||||
(79,8,'b','b'),(80,0,'p','p'),(81,9,'m','m'),(82,5,'k','k'),(83,7,'u','u'),(84,0,'y','y'),
|
||||
(85,2,'x','x'),(86,5,'h','h'),(87,5,'j','j'),(88,5,'o','o'),(89,9,'o','o'),(90,1,'c','c'),
|
||||
(91,7,'k','k'),(92,9,'t','t'),(93,3,'h','h'),(94,6,'g','g'),(95,9,'r','r'),(96,2,'i','i');
|
||||
|
||||
CREATE TABLE t2 (i INT) ENGINE=MyISAM;
|
||||
INSERT INTO t2 VALUES (7),(8);
|
||||
|
||||
SELECT STRAIGHT_JOIN COUNT(DISTINCT t1.id) FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
|
||||
EXPLAIN EXTENDED
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
|
||||
set join_buffer_size=1024;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
|
||||
set join_buffer_size=1024*16;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
|
||||
set join_buffer_size=default;
|
||||
SELECT STRAIGHT_JOIN DISTINCT t1.id FROM
|
||||
t1, v1, t2 WHERE v1.id = t2.i AND t1.i1 = v1.i1 AND t2.i != 3;
|
||||
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
--echo #
|
||||
--echo # Bug #11744875: 4082: integer lengths cause truncation with distinct concat and innodb
|
||||
--echo #
|
||||
|
||||
@ -283,3 +283,15 @@ SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
|
||||
SELECT * FROM t1 WHERE NOT (concat( dt, '1' ) IS NOT NULL);
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo #
|
||||
--echo # Bug mdev-5132: crash when exeicuting a join query
|
||||
--echo # with IS NULL and IS NOT NULL in where
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1 (a DATE, b INT, c INT, KEY(a), KEY(b), KEY(c)) ENGINE=MyISAM;
|
||||
CREATE TABLE t2 (d DATE) ENGINE=MyISAM;
|
||||
|
||||
SELECT * FROM t1,t2 WHERE 1 IS NOT NULL AND t1.b IS NULL;
|
||||
|
||||
DROP TABLE t1,t2;
|
||||
|
||||
Reference in New Issue
Block a user