Skip to content
This repository was archived by the owner on Oct 5, 2021. It is now read-only.

Commit 248abbc

Browse files
marcalffmarcalff
committed
Merge mysql-next-mr --> mysql-next-mr-wl4816
2 parents 0d63a1f + f05b0ee commit 248abbc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+9621
-291
lines changed

‎libmysqld/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
8585
../sql/sql_alter.cc ../sql/sql_partition_admin.cc
8686
../sql/event_parse_data.cc
8787
../sql/sql_signal.cc ../sql/rpl_handler.cc
88-
../sql/rpl_utility.cc ../sql/binlog.cc
89-
../sql/sys_vars.cc
88+
../sql/rpl_utility.cc ../sql/binlog.cc ../sql/sys_vars.cc
89+
../sql/gcalc_slicescan.cc ../sql/gcalc_tools.cc
9090
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
9191
../sql/mdl.cc ../sql/transaction.cc ../sql/sql_bootstrap.cc
9292
${GEN_SOURCES}

‎libmysqld/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
8080
sql_servers.cc event_parse_data.cc sql_signal.cc \
8181
sql_bootstrap.cc \
8282
binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \
83+
gcalc_slicescan.cc gcalc_tools.cc \
8384
sql_partition_admin.cc
8485

8586
libmysqld_int_a_SOURCES= $(libmysqld_sources)

‎mysql-test/include/ctype_unicode_latin.inc

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ insert into t1 values ('AA'),('Aa'),('aa'),('aA');
169169
insert into t1 values ('AE'),('Ae'),('ae'),('aE');
170170
insert into t1 values ('CH'),('Ch'),('ch'),('cH');
171171
insert into t1 values ('DZ'),('Dz'),('dz'),('dZ');
172+
insert into t1 values ('DŽ'),('Dž'),('dž'),('dŽ');
172173
insert into t1 values ('IJ'),('Ij'),('ij'),('iJ');
173174
insert into t1 values ('LJ'),('Lj'),('lj'),('lJ');
174175
insert into t1 values ('LL'),('Ll'),('ll'),('lL');

‎mysql-test/r/archive_gis.result

+9-9
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ explain extended select Dimension(g), GeometryType(g), IsEmpty(g), AsText(Envelo
236236
id select_type table type possible_keys key key_len ref rows filtered Extra
237237
1 SIMPLE gis_geometry ALL NULL NULL NULL NULL 21 100.00
238238
Warnings:
239-
Note 1003 select dimension(`test`.`gis_geometry`.`g`) AS `Dimension(g)`,geometrytype(`test`.`gis_geometry`.`g`) AS `GeometryType(g)`,isempty(`test`.`gis_geometry`.`g`) AS `IsEmpty(g)`,astext(envelope(`test`.`gis_geometry`.`g`)) AS `AsText(Envelope(g))` from `test`.`gis_geometry`
239+
Note 1003 select st_dimension(`test`.`gis_geometry`.`g`) AS `Dimension(g)`,st_geometrytype(`test`.`gis_geometry`.`g`) AS `GeometryType(g)`,st_isempty(`test`.`gis_geometry`.`g`) AS `IsEmpty(g)`,st_astext(st_envelope(`test`.`gis_geometry`.`g`)) AS `AsText(Envelope(g))` from `test`.`gis_geometry`
240240
SELECT fid, X(g) FROM gis_point ORDER by fid;
241241
fid X(g)
242242
101 10
@@ -253,7 +253,7 @@ explain extended select X(g),Y(g) FROM gis_point;
253253
id select_type table type possible_keys key key_len ref rows filtered Extra
254254
1 SIMPLE gis_point ALL NULL NULL NULL NULL 4 100.00
255255
Warnings:
256-
Note 1003 select x(`test`.`gis_point`.`g`) AS `X(g)`,y(`test`.`gis_point`.`g`) AS `Y(g)` from `test`.`gis_point`
256+
Note 1003 select st_x(`test`.`gis_point`.`g`) AS `X(g)`,st_y(`test`.`gis_point`.`g`) AS `Y(g)` from `test`.`gis_point`
257257
SELECT fid, AsText(StartPoint(g)) FROM gis_line ORDER by fid;
258258
fid AsText(StartPoint(g))
259259
105 POINT(0 0)
@@ -288,7 +288,7 @@ explain extended select AsText(StartPoint(g)),AsText(EndPoint(g)),GLength(g),Num
288288
id select_type table type possible_keys key key_len ref rows filtered Extra
289289
1 SIMPLE gis_line ALL NULL NULL NULL NULL 3 100.00
290290
Warnings:
291-
Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint(g))`,astext(endpoint(`test`.`gis_line`.`g`)) AS `AsText(EndPoint(g))`,glength(`test`.`gis_line`.`g`) AS `GLength(g)`,numpoints(`test`.`gis_line`.`g`) AS `NumPoints(g)`,astext(pointn(`test`.`gis_line`.`g`,2)) AS `AsText(PointN(g, 2))`,isclosed(`test`.`gis_line`.`g`) AS `IsClosed(g)` from `test`.`gis_line`
291+
Note 1003 select st_astext(st_startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint(g))`,st_astext(st_endpoint(`test`.`gis_line`.`g`)) AS `AsText(EndPoint(g))`,st_length(`test`.`gis_line`.`g`) AS `GLength(g)`,st_numpoints(`test`.`gis_line`.`g`) AS `NumPoints(g)`,st_astext(st_pointn(`test`.`gis_line`.`g`,2)) AS `AsText(PointN(g, 2))`,st_isclosed(`test`.`gis_line`.`g`) AS `IsClosed(g)` from `test`.`gis_line`
292292
SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
293293
fid AsText(Centroid(g))
294294
108 POINT(15 15)
@@ -318,7 +318,7 @@ explain extended select AsText(Centroid(g)),Area(g),AsText(ExteriorRing(g)),NumI
318318
id select_type table type possible_keys key key_len ref rows filtered Extra
319319
1 SIMPLE gis_polygon ALL NULL NULL NULL NULL 3 100.00
320320
Warnings:
321-
Note 1003 select astext(centroid(`test`.`gis_polygon`.`g`)) AS `AsText(Centroid(g))`,area(`test`.`gis_polygon`.`g`) AS `Area(g)`,astext(exteriorring(`test`.`gis_polygon`.`g`)) AS `AsText(ExteriorRing(g))`,numinteriorrings(`test`.`gis_polygon`.`g`) AS `NumInteriorRings(g)`,astext(interiorringn(`test`.`gis_polygon`.`g`,1)) AS `AsText(InteriorRingN(g, 1))` from `test`.`gis_polygon`
321+
Note 1003 select st_astext(st_centroid(`test`.`gis_polygon`.`g`)) AS `AsText(Centroid(g))`,st_area(`test`.`gis_polygon`.`g`) AS `Area(g)`,st_astext(st_exteriorring(`test`.`gis_polygon`.`g`)) AS `AsText(ExteriorRing(g))`,st_numinteriorrings(`test`.`gis_polygon`.`g`) AS `NumInteriorRings(g)`,st_astext(st_interiorringn(`test`.`gis_polygon`.`g`,1)) AS `AsText(InteriorRingN(g, 1))` from `test`.`gis_polygon`
322322
SELECT fid, IsClosed(g) FROM gis_multi_line ORDER by fid;
323323
fid IsClosed(g)
324324
114 0
@@ -357,7 +357,7 @@ explain extended SELECT fid, NumGeometries(g) from gis_multi_point;
357357
id select_type table type possible_keys key key_len ref rows filtered Extra
358358
1 SIMPLE gis_multi_point ALL NULL NULL NULL NULL 3 100.00
359359
Warnings:
360-
Note 1003 select `test`.`gis_multi_point`.`fid` AS `fid`,numgeometries(`test`.`gis_multi_point`.`g`) AS `NumGeometries(g)` from `test`.`gis_multi_point`
360+
Note 1003 select `test`.`gis_multi_point`.`fid` AS `fid`,st_numgeometries(`test`.`gis_multi_point`.`g`) AS `NumGeometries(g)` from `test`.`gis_multi_point`
361361
SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point ORDER by fid;
362362
fid AsText(GeometryN(g, 2))
363363
111 POINT(10 10)
@@ -385,17 +385,17 @@ explain extended SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point;
385385
id select_type table type possible_keys key key_len ref rows filtered Extra
386386
1 SIMPLE gis_multi_point ALL NULL NULL NULL NULL 3 100.00
387387
Warnings:
388-
Note 1003 select `test`.`gis_multi_point`.`fid` AS `fid`,astext(geometryn(`test`.`gis_multi_point`.`g`,2)) AS `AsText(GeometryN(g, 2))` from `test`.`gis_multi_point`
388+
Note 1003 select `test`.`gis_multi_point`.`fid` AS `fid`,st_astext(st_geometryn(`test`.`gis_multi_point`.`g`,2)) AS `AsText(GeometryN(g, 2))` from `test`.`gis_multi_point`
389389
SELECT g1.fid as first, g2.fid as second,
390390
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
391391
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
392392
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
393393
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
394394
first second w c o e d t i r
395-
120 120 1 1 0 1 0 0 1 0
395+
120 120 1 1 0 1 0 1 1 0
396396
120 121 0 0 1 0 0 0 1 0
397397
121 120 0 0 1 0 0 0 1 0
398-
121 121 1 1 0 1 0 0 1 0
398+
121 121 1 1 0 1 0 1 1 0
399399
explain extended SELECT g1.fid as first, g2.fid as second,
400400
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
401401
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
@@ -405,7 +405,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
405405
1 SIMPLE g1 ALL NULL NULL NULL NULL 2 100.00 Using temporary; Using filesort
406406
1 SIMPLE g2 ALL NULL NULL NULL NULL 2 100.00 Using join buffer (BNL, regular buffers)
407407
Warnings:
408-
Note 1003 select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
408+
Note 1003 select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,mbrwithin(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,mbrcontains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,mbroverlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,mbrequals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,mbrdisjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,st_touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,mbrintersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,st_crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
409409
DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
410410
CREATE TABLE t1 (
411411
a INTEGER PRIMARY KEY AUTO_INCREMENT,

‎mysql-test/r/ctype_binary.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ t1 CREATE TABLE `t1` (
11831183
drop table t1;
11841184
select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
11851185
hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
1186-
30
1186+
31
11871187
create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
11881188
show create table t1;
11891189
Table Create Table

‎mysql-test/r/ctype_cp1251.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1265,7 +1265,7 @@ t1 CREATE TABLE `t1` (
12651265
drop table t1;
12661266
select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
12671267
hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
1268-
30
1268+
31
12691269
create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
12701270
show create table t1;
12711271
Table Create Table

‎mysql-test/r/ctype_latin1.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ t1 CREATE TABLE `t1` (
15931593
drop table t1;
15941594
select hex(concat(IsSimple(GeomFromText('POINT(1 1)'))));
15951595
hex(concat(IsSimple(GeomFromText('POINT(1 1)'))))
1596-
30
1596+
31
15971597
create table t1 as select concat(IsSimple(GeomFromText('Point(1 1)'))) as c1;
15981598
show create table t1;
15991599
Table Create Table

0 commit comments

Comments
 (0)