Skip to content

Commit 83df4a3

Browse files
committed
MDEV-37864: mysql-test/mtr --cursor main.func_json fails (postfix)
Postfix to correct view-protocol
1 parent cd28452 commit 83df4a3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

mysql-test/main/func_json.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5294,14 +5294,14 @@ result
52945294
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
52955295
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
52965296
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
5297-
SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) );
5298-
( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) )
5297+
SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) ) as result;
5298+
result
52995299
1.000000
53005300
#
53015301
# MDEV-37864: mysql-test/mtr --cursor main.func_json fails
53025302
#
5303-
select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') from mysql.user;
5304-
json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]')
5303+
select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
5304+
result
53055305
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
53065306
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
53075307
[["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]

mysql-test/main/func_json.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4194,12 +4194,12 @@ SELECT json_array_intersect(@a,@b);
41944194
--echo # MDEV-36809: json_array_intersect crashs when unused table ref provided
41954195
--echo #
41964196
select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
4197-
SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) );
4197+
SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) ) as result;
41984198

41994199
--echo #
42004200
--echo # MDEV-37864: mysql-test/mtr --cursor main.func_json fails
42014201
--echo #
42024202

4203-
select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') from mysql.user;
4203+
select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
42044204

42054205
--echo # End of 11.4 Test

0 commit comments

Comments
 (0)