Skip to content

Commit 5eae8c2

Browse files
dr-mdr-m
committed
Merge 10.4 into 10.5
2 parents bf310b4 + 8341f58 commit 5eae8c2

37 files changed

+880
-941
lines changed

‎cmake/os/WindowsCache.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ SET(HAVE_LRAND48 CACHE INTERNAL "")
9090
SET(HAVE_LSTAT CACHE INTERNAL "")
9191
SET(HAVE_MADVISE CACHE INTERNAL "")
9292
SET(HAVE_MALLINFO CACHE INTERNAL "")
93+
SET(HAVE_MALLINFO2 CACHE INTERNAL "")
9394
SET(HAVE_MALLOC_H 1 CACHE INTERNAL "")
9495
SET(HAVE_MEMALIGN CACHE INTERNAL "")
9596
SET(HAVE_MEMCPY 1 CACHE INTERNAL "")

‎mysql-test/main/gis-json.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ SELECT st_astext(st_geomfromgeojson('{ "type": "FeatureCollection", "features":
6262
st_astext(st_geomfromgeojson('{ "type": "FeatureCollection", "features": [{ "type": "Feature", "geometry": { "type": "Point", "coordinates": [102.0, 0.5] }, "properties": { "prop0": "value0" } }]}'))
6363
GEOMETRYCOLLECTION(POINT(102 0.5))
6464
SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',5));
65-
ERROR HY000: Incorrect option value: '5' for function ST_GeometryFromJSON
65+
ERROR HY000: Incorrect option value: '5' for function ST_GeomFromGeoJSON
6666
SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',1));
67-
ERROR 22023: Invalid GIS data provided to function ST_GeometryFromJSON.
67+
ERROR 22023: Invalid GIS data provided to function ST_GeomFromGeoJSON.
6868
SELECT ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',2));
6969
ST_AsText(ST_GeomFromGeoJSON('{ "type": "Point", "coordinates": [5.3, 15.0, 4.3]}',2))
7070
POINT(5.3 15)

‎mysql-test/main/gis-precise.result

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,3 +806,114 @@ SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))));
806806
ASTEXT(ST_BUFFER(POLYGONFROMTEXT(' POLYGON((9 9,5 2,4 5,9 9))'),
807807
SRID(GEOMETRYFROMTEXT(' MULTIPOINT(8 4,5 0,7 8,6 9,3 4,7 3,5 5) '))))
808808
POLYGON((9 9,5 2,4 5,9 9))
809+
#
810+
# MDEV-13467 Feature request: Support for ST_Distance_Sphere()
811+
#
812+
SELECT ST_DISTANCE_SPHERE();
813+
ERROR 42000: Incorrect parameter count in the call to native function 'ST_DISTANCE_SPHERE'
814+
SELECT ST_DISTANCE_SPHERE(NULL);
815+
ERROR 42000: Incorrect parameter count in the call to native function 'ST_DISTANCE_SPHERE'
816+
SELECT ST_DISTANCE_SPHERE(NULL, NULL);
817+
ST_DISTANCE_SPHERE(NULL, NULL)
818+
NULL
819+
SELECT ST_DISTANCE_SPHERE(NULL, NULL, 3);
820+
ST_DISTANCE_SPHERE(NULL, NULL, 3)
821+
NULL
822+
SELECT ST_DISTANCE_SPHERE(NULL, 1, 3);
823+
ST_DISTANCE_SPHERE(NULL, 1, 3)
824+
NULL
825+
SELECT ST_DISTANCE_SPHERE(1, NULL, 3);
826+
ST_DISTANCE_SPHERE(1, NULL, 3)
827+
NULL
828+
SELECT ST_DISTANCE_SPHERE(1, 1);
829+
ERROR 22023: Invalid GIS data provided to function ST_Distance_Sphere.
830+
SELECT ST_DISTANCE_SPHERE(1, 1, 3);
831+
ERROR 22023: Invalid GIS data provided to function ST_Distance_Sphere.
832+
SELECT ST_DISTANCE_SPHERE(1, 1, NULL);
833+
ST_DISTANCE_SPHERE(1, 1, NULL)
834+
NULL
835+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'));
836+
ERROR HY000: Internal error: st_distance_sphere
837+
# Test Points and radius
838+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
839+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'))
840+
157249.0357231545
841+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10);
842+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10)
843+
157225.0865419108
844+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1);
845+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1)
846+
0.024682056391766436
847+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0);
848+
ERROR HY000: Internal error: Radius must be greater than zero.
849+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1);
850+
ERROR HY000: Internal error: Radius must be greater than zero.
851+
# Test longitude/lattitude
852+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
853+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10)
854+
157225.0865419108
855+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10);
856+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10)
857+
222355.4901806686
858+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
859+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10)
860+
222389.3645969269
861+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'));
862+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'))
863+
157249.0357231545
864+
# Test Points - Multipoints
865+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'));
866+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'))
867+
157249.0357231545
868+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'));
869+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'))
870+
157249.0357231545
871+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'));
872+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'))
873+
157249.0357231545
874+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'));
875+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'))
876+
157249.0357231545
877+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1);
878+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1)
879+
0.024682056391766436
880+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1);
881+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1)
882+
0.024682056391766436
883+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1);
884+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1)
885+
0.024682056391766436
886+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1);
887+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1)
888+
0.024682056391766436
889+
# Test Multipoints - Multipoints
890+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'));
891+
ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'))
892+
0
893+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10);
894+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10)
895+
314282.5644496733
896+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10);
897+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10)
898+
314282.5644496733
899+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17);
900+
TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17)
901+
0.04933028646581131
902+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0);
903+
ERROR HY000: Internal error: Radius must be greater than zero.
904+
set @pt1 = ST_GeomFromText('POINT(190 -30)');
905+
set @pt2 = ST_GeomFromText('POINT(-30 50)');
906+
SELECT ST_Distance_Sphere(@pt1, @pt2);
907+
ERROR HY000: Out of range error: Longitude should be [-180,180] in function ST_Distance_Sphere.
908+
set @pt1 = ST_GeomFromText('POINT(135 -30)');
909+
set @pt2 = ST_GeomFromText('POINT(-30 91)');
910+
SELECT ST_Distance_Sphere(@pt1, @pt2);
911+
ERROR HY000: Out of range error: Latitude should be [-90,90] in function ST_Distance_Sphere.
912+
set @zenica = ST_GeomFromText('POINT(17.907743 44.203438)');
913+
set @sarajevo = ST_GeomFromText('POINT(18.413076 43.856258)');
914+
SELECT TRUNCATE(ST_Distance_Sphere(@zenica, @sarajevo), 10);
915+
TRUNCATE(ST_Distance_Sphere(@zenica, @sarajevo), 10)
916+
55878.5933759170
917+
SELECT TRUNCATE(ST_Distance_Sphere(@sarajevo, @zenica), 10);
918+
TRUNCATE(ST_Distance_Sphere(@sarajevo, @zenica), 10)
919+
55878.5933759170

‎mysql-test/main/gis-precise.test

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,3 +394,81 @@ with cte1 as( select (st_symdifference(point(1,1),point(1,1))) as a1 ), cte2 a
394394

395395
--source include/gis_debug.inc
396396

397+
398+
--echo #
399+
--echo # MDEV-13467 Feature request: Support for ST_Distance_Sphere()
400+
--echo #
401+
402+
--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
403+
SELECT ST_DISTANCE_SPHERE();
404+
--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
405+
SELECT ST_DISTANCE_SPHERE(NULL);
406+
SELECT ST_DISTANCE_SPHERE(NULL, NULL);
407+
# NULL args and optional radius will return NULL
408+
SELECT ST_DISTANCE_SPHERE(NULL, NULL, 3);
409+
# At least 1 NULL arg and optional radius will return NULL
410+
SELECT ST_DISTANCE_SPHERE(NULL, 1, 3);
411+
# At least 1 NULL arg and optional radius will return NULL
412+
SELECT ST_DISTANCE_SPHERE(1, NULL, 3);
413+
# Return ER_GIS_INVALID_DATA for invalid geometry
414+
--error ER_GIS_INVALID_DATA
415+
SELECT ST_DISTANCE_SPHERE(1, 1);
416+
--error ER_GIS_INVALID_DATA
417+
SELECT ST_DISTANCE_SPHERE(1, 1, 3);
418+
# Return NULL if radius is NULL
419+
SELECT ST_DISTANCE_SPHERE(1, 1, NULL);
420+
# Wrong geometry
421+
--error ER_INTERNAL_ERROR
422+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('LINESTRING(0 0, 1 1)'));
423+
424+
--echo # Test Points and radius
425+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'));
426+
# make bb x86 happy
427+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(-1 -1)'), ST_GEOMFROMTEXT('POINT(-2 -2)')), 10);
428+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 1);
429+
--error ER_INTERNAL_ERROR
430+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), 0);
431+
--error ER_INTERNAL_ERROR
432+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('POINT(1 1)'), -1);
433+
--echo # Test longitude/lattitude
434+
# make bb x86 happy
435+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
436+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 1)'), ST_GEOMFROMTEXT('POINT(2 1)')), 10);
437+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(1 2)')), 10);
438+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(1 0)'), ST_GEOMFROMTEXT('POINT(2 1)'));
439+
--echo # Test Points - Multipoints
440+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1)'));
441+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 1)'), ST_GEOMFROMTEXT('POINT(0 0)'));
442+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'));
443+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'));
444+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(1 1,2 2)'), 1);
445+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2,1 1)'), 1);
446+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1, 3 4)'), 1);
447+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('POINT(0 0)'), ST_GEOMFROMTEXT('MULTIPOINT(2 2, 1 1,5 6)'), 1);
448+
--echo # Test Multipoints - Multipoints
449+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )'));
450+
# make bb x86 happy
451+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(3 4,8 9 )')), 10);
452+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )')), 10);
453+
# make bb x86 happy
454+
SELECT TRUNCATE(ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),1), 17);
455+
--error ER_INTERNAL_ERROR
456+
SELECT ST_DISTANCE_SPHERE(ST_GEOMFROMTEXT('MULTIPOINT(1 2,1 1 )'), ST_GEOMFROMTEXT('MULTIPOINT(8 9,3 4 )'),0);
457+
458+
# Longitude out of range [-180,180]
459+
set @pt1 = ST_GeomFromText('POINT(190 -30)');
460+
set @pt2 = ST_GeomFromText('POINT(-30 50)');
461+
--error ER_STD_OUT_OF_RANGE_ERROR
462+
SELECT ST_Distance_Sphere(@pt1, @pt2);
463+
464+
# Latitude out of range [-90, 90]
465+
set @pt1 = ST_GeomFromText('POINT(135 -30)');
466+
set @pt2 = ST_GeomFromText('POINT(-30 91)');
467+
--error ER_STD_OUT_OF_RANGE_ERROR
468+
SELECT ST_Distance_Sphere(@pt1, @pt2);
469+
470+
# POINT in form (longitude[-180, 180] latitude[-90, 90])
471+
set @zenica = ST_GeomFromText('POINT(17.907743 44.203438)');
472+
set @sarajevo = ST_GeomFromText('POINT(18.413076 43.856258)');
473+
SELECT TRUNCATE(ST_Distance_Sphere(@zenica, @sarajevo), 10);
474+
SELECT TRUNCATE(ST_Distance_Sphere(@sarajevo, @zenica), 10);

‎mysql-test/main/userstat.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
-- source include/have_innodb.inc
77
-- source include/have_log_bin.inc
8+
-- source include/have_perfschema.inc
89

910
select variable_value from information_schema.global_status where variable_name="handler_read_key" into @global_read_key;
1011
show columns from information_schema.client_statistics;

‎mysql-test/suite/binlog/t/binlog_xa_recover.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
--source include/have_debug.inc
99
--source include/have_debug_sync.inc
1010
--source include/have_binlog_format_row.inc
11+
--source include/have_perfschema.inc
1112
# Valgrind does not work well with test that crashes the server
1213
--source include/not_valgrind.inc
1314

‎mysql-test/suite/encryption/t/innodb-discard-import-change.combinations

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32

‎mysql-test/suite/encryption/t/innodb-discard-import.combinations

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[strict_crc32]
2+
--innodb-checksum-algorithm=strict_crc32
3+
4+
[strict_full_crc32]
5+
--innodb-checksum-algorithm=strict_full_crc32

‎mysql-test/suite/galera/r/galera_ssl_upgrade.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown");
12
SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
23
VARIABLE_VALUE = 'Synced'
34
1

‎mysql-test/suite/galera/t/galera_ssl_upgrade.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
--source include/have_innodb.inc
99
--source include/have_ssl_communication.inc
1010

11+
call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown");
12+
1113
SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
1214
SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
1315

0 commit comments

Comments
 (0)