diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-26 19:09:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-26 19:09:47 +0100 |
| commit | e308d7417bc4ceb1b3b72cac2642015b88f310ff (patch) | |
| tree | 2b840dabe2a4581c45e9ec7e14669b2b5558a42a /mysql-test/t | |
| parent | 045c498691f77ac8e0d8c8b9b705325b3425c69d (diff) | |
| parent | 48be80cd95c9121d2730ebcd1df2a1a37fe73f3d (diff) | |
| download | mariadb-git-e308d7417bc4ceb1b3b72cac2642015b88f310ff.tar.gz | |
5.2 merge
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/func_group_innodb.test | 18 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 7 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 17 |
3 files changed, 41 insertions, 1 deletions
diff --git a/mysql-test/t/func_group_innodb.test b/mysql-test/t/func_group_innodb.test index b6752556a0a..3ca8755f266 100644 --- a/mysql-test/t/func_group_innodb.test +++ b/mysql-test/t/func_group_innodb.test @@ -126,7 +126,20 @@ SELECT member_id_to, COUNT(*) FROM t1 WHERE r_date = DROP TABLE t1; ---echo # End of test BUG#12713907 +--echo # +--echo # MDEV-4269: crash when grouping by values() +--echo # + +SELECT @@storage_engine INTO @old_engine; +set storage_engine=innodb; + +create table y select 1 b; +select 1 from y group by b; +select 1 from y group by values(b); +drop table y; +SET storage_engine=@old_engine; + +### End of 5.1 tests --echo # --echo # Bug#13723054 CRASH WITH MIN/MAX AFTER QUICK_GROUP_MIN_MAX_SELECT::NEXT_MIN @@ -140,3 +153,6 @@ SELECT MIN(c) FROM t1 GROUP BY b; EXPLAIN SELECT MIN(c) FROM t1 GROUP BY b; DROP TABLE t1; + +### End of 5.2 tests + diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 406411eb704..9e1da337623 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1394,5 +1394,12 @@ SELECT REPEAT('1', DAY(FROM_UNIXTIME(-1))); SELECT RPAD('hi', DAY(FROM_UNIXTIME(-1)),'?'); SELECT LPAD('hi', DAY(FROM_UNIXTIME(-1)),'?'); +# +# MDEV-4289 Assertion `0' fails in make_sortkey with GROUP_CONCAT, MAKE_SET, GROUP BY +# +create table t1 (i int); +insert into t1 values (null),(8); +select group_concat( i ), make_set( i, 'a', 'b' ) field from t1 group by field; +drop table t1; --echo End of 5.1 tests diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 6b4578c39c1..9e743a65cdb 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -820,7 +820,24 @@ SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20))); --error ER_ILLEGAL_VALUE_FOR_TYPE SELECT GEOMETRYCOLLECTION((SELECT @@OLD)); +--echo # +--echo # MDEV-4252 geometry query crashes server +--echo # +select astext(0x0100000000030000000100000000000010); +select envelope(0x0100000000030000000100000000000010); +select geometryn(0x0100000000070000000100000001030000000200000000000000ffff0000, 1); +select geometryn(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1); + +--echo # +--echo # MDEV-4296 Assertion `n_linear_rings > 0' fails in Gis_polygon::centroid_xy +--echo # + +SELECT Centroid( AsBinary( LineString(Point(0,0), Point(0,0), Point(0,0) ))); +--echo # +--echo # MDEV-4295 Server crashes in get_point on a query with Area, AsBinary, MultiPoint +--echo # +SELECT Area(AsBinary(MultiPoint(Point(0,9), Point(0,1), Point(2,2)))); --echo End of 5.1 tests #bug 850775 ST_AREA does not work on GEOMETRYCOLLECTIONs in maria-5.3-gis |