Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ba3d0b17
Commit
ba3d0b17
authored
Jan 27, 2014
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Plain Diff
Merge 5.3 -> 5.5
parents
31249744
669c6620
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
0 deletions
+75
-0
mysql-test/r/func_time.result
mysql-test/r/func_time.result
+10
-0
mysql-test/r/subselect_mat.result
mysql-test/r/subselect_mat.result
+18
-0
mysql-test/r/subselect_sj_mat.result
mysql-test/r/subselect_sj_mat.result
+18
-0
mysql-test/t/func_time.test
mysql-test/t/func_time.test
+9
-0
mysql-test/t/subselect_sj_mat.test
mysql-test/t/subselect_sj_mat.test
+20
-0
No files found.
mysql-test/r/func_time.result
View file @
ba3d0b17
...
...
@@ -2374,3 +2374,13 @@ EXTRACT(HOUR FROM TIME('1 02:00:00')) EXTRACT(HOUR FROM TIME('26:00:00'))
SELECT EXTRACT(DAY FROM TIME('1 02:00:00')), EXTRACT(DAY FROM TIME('26:00:00'));
EXTRACT(DAY FROM TIME('1 02:00:00')) EXTRACT(DAY FROM TIME('26:00:00'))
1 1
#
# MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP BY, ROLLUP
#
CREATE TABLE t1 (i INT);
INSERT INTO t1 VALUES (1),(2);
SELECT 1 FROM t1 GROUP BY MONTHNAME(0) WITH ROLLUP;
1
1
1
DROP TABLE t1;
mysql-test/r/subselect_mat.result
View file @
ba3d0b17
...
...
@@ -2037,6 +2037,24 @@ INSERT INTO t1 VALUES (1,3,5),(2,4,6);
SELECT * FROM t1 WHERE 8 IN (SELECT MIN(pk) FROM t1) AND (pk = a OR pk = b);
pk a b
DROP TABLE t1;
#
# MDEV-5368: Server crashes in Item_in_subselect::optimize on 2nd
# execution of PS with IN subqueries, materialization+semijoin
#
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(3);
CREATE TABLE t2 (b INT) ENGINE=MyISAM;
CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
INSERT INTO t2 VALUES (8),(9);
PREPARE stmt FROM "
SELECT * FROM t1 WHERE 1 IN ( SELECT b FROM v2 WHERE 2 IN ( SELECT MAX(a) FROM t1 ) )
";
EXECUTE stmt;
a
EXECUTE stmt;
a
DROP TABLE t1, t2;
DROP VIEW v2;
# End of 5.3 tests
#
# MDEV-5056: Wrong result (extra rows) with materialization+semijoin, IN subqueries
...
...
mysql-test/r/subselect_sj_mat.result
View file @
ba3d0b17
...
...
@@ -2077,6 +2077,24 @@ INSERT INTO t1 VALUES (1,3,5),(2,4,6);
SELECT * FROM t1 WHERE 8 IN (SELECT MIN(pk) FROM t1) AND (pk = a OR pk = b);
pk a b
DROP TABLE t1;
#
# MDEV-5368: Server crashes in Item_in_subselect::optimize on 2nd
# execution of PS with IN subqueries, materialization+semijoin
#
CREATE TABLE t1 (a INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(3);
CREATE TABLE t2 (b INT) ENGINE=MyISAM;
CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM t2;
INSERT INTO t2 VALUES (8),(9);
PREPARE stmt FROM "
SELECT * FROM t1 WHERE 1 IN ( SELECT b FROM v2 WHERE 2 IN ( SELECT MAX(a) FROM t1 ) )
";
EXECUTE stmt;
a
EXECUTE stmt;
a
DROP TABLE t1, t2;
DROP VIEW v2;
# End of 5.3 tests
#
# MDEV-5056: Wrong result (extra rows) with materialization+semijoin, IN subqueries
...
...
mysql-test/t/func_time.test
View file @
ba3d0b17
...
...
@@ -1447,3 +1447,12 @@ SELECT EXTRACT(HOUR FROM '1 02:00:00'), EXTRACT(HOUR FROM '26:00:00');
SELECT
EXTRACT
(
HOUR
FROM
TIME
'1 02:00:00'
),
EXTRACT
(
HOUR
FROM
TIME
'26:00:00'
);
SELECT
EXTRACT
(
HOUR
FROM
TIME
(
'1 02:00:00'
)),
EXTRACT
(
HOUR
FROM
TIME
(
'26:00:00'
));
SELECT
EXTRACT
(
DAY
FROM
TIME
(
'1 02:00:00'
)),
EXTRACT
(
DAY
FROM
TIME
(
'26:00:00'
));
--
echo
#
--
echo
# MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP BY, ROLLUP
--
echo
#
CREATE
TABLE
t1
(
i
INT
);
INSERT
INTO
t1
VALUES
(
1
),(
2
);
SELECT
1
FROM
t1
GROUP
BY
MONTHNAME
(
0
)
WITH
ROLLUP
;
DROP
TABLE
t1
;
mysql-test/t/subselect_sj_mat.test
View file @
ba3d0b17
...
...
@@ -1725,6 +1725,26 @@ INSERT INTO t1 VALUES (1,3,5),(2,4,6);
SELECT
*
FROM
t1
WHERE
8
IN
(
SELECT
MIN
(
pk
)
FROM
t1
)
AND
(
pk
=
a
OR
pk
=
b
);
DROP
TABLE
t1
;
--
echo
#
--
echo
# MDEV-5368: Server crashes in Item_in_subselect::optimize on 2nd
--
echo
# execution of PS with IN subqueries, materialization+semijoin
--
echo
#
CREATE
TABLE
t1
(
a
INT
)
ENGINE
=
MyISAM
;
INSERT
INTO
t1
VALUES
(
1
),(
3
);
CREATE
TABLE
t2
(
b
INT
)
ENGINE
=
MyISAM
;
CREATE
ALGORITHM
=
MERGE
VIEW
v2
AS
SELECT
*
FROM
t2
;
INSERT
INTO
t2
VALUES
(
8
),(
9
);
PREPARE
stmt
FROM
"
SELECT * FROM t1 WHERE 1 IN ( SELECT b FROM v2 WHERE 2 IN ( SELECT MAX(a) FROM t1 ) )
"
;
EXECUTE
stmt
;
EXECUTE
stmt
;
DROP
TABLE
t1
,
t2
;
DROP
VIEW
v2
;
--
echo
# End of 5.3 tests
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment