mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 10.5 into 10.6
This commit is contained in:
@ -1727,6 +1727,8 @@ explain select
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
|
||||
#Enable after fix MDEV-31552
|
||||
--disable_cursor_protocol
|
||||
select
|
||||
t1.PARENT_ID,
|
||||
min(CHILD_FIELD)
|
||||
@ -1734,6 +1736,7 @@ select
|
||||
where t1.PARENT_ID = 1
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
--enable_cursor_protocol
|
||||
|
||||
select
|
||||
1,
|
||||
@ -1765,6 +1768,8 @@ explain select
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
|
||||
#Enable after fix MDEV-31552
|
||||
--disable_cursor_protocol
|
||||
select
|
||||
t1.PARENT_ID,
|
||||
min(CHILD_FIELD)
|
||||
@ -1772,6 +1777,7 @@ select
|
||||
where t1.PARENT_ID = 1
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
--enable_cursor_protocol
|
||||
|
||||
drop table t1,t2;
|
||||
|
||||
@ -1898,6 +1904,8 @@ explain select
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
|
||||
#Enable after fix MDEV-31552
|
||||
--disable_cursor_protocol
|
||||
select
|
||||
t1.PARENT_ID,
|
||||
min(CHILD_FIELD)
|
||||
@ -1905,6 +1913,7 @@ select
|
||||
where t1.PARENT_ID = 1
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
--enable_cursor_protocol
|
||||
|
||||
select
|
||||
1,
|
||||
@ -1936,6 +1945,8 @@ explain select
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
|
||||
#Enable after fix MDEV-31552
|
||||
--disable_cursor_protocol
|
||||
select
|
||||
t1.PARENT_ID,
|
||||
min(CHILD_FIELD)
|
||||
@ -1943,6 +1954,7 @@ select
|
||||
where t1.PARENT_ID = 1
|
||||
and t1.PARENT_ID = t2.PARENT_ID
|
||||
and t2.CHILD_FIELD = "ZZZZ";
|
||||
--enable_cursor_protocol
|
||||
|
||||
drop table t1,t2;
|
||||
|
||||
|
Reference in New Issue
Block a user