database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-12-14 11:34:30 +02:00
parent 159a6c2e60 1b5f0cbd46
commit 866ccc8890
58 changed files with 663 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_gis/t/kill_server.test
View File

@ -58,7 +58,8 @@ CALL insert_t1(5000);
COMMIT;
--source include/kill_and_restart_mysqld.inc
--let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Clean up.
drop procedure insert_t1;

3
mysql-test/suite/innodb_gis/t/rtree_compress2.test
View File

@ -51,7 +51,8 @@ CALL insert_t1(5000);
COMMIT;
--source include/kill_and_restart_mysqld.inc
--let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Clean up.
drop procedure insert_t1;

5
mysql-test/suite/innodb_gis/t/rtree_recovery.test
View File

@ -44,7 +44,8 @@ delimiter ;|
CALL insert_t1(367);
COMMIT;
--source include/kill_and_restart_mysqld.inc
--let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Check table.
check table t1;
@ -63,7 +64,7 @@ SET @poly1 = ST_GeomFromText('POLYGON((10000 10000, 10000 10350, 10350 10350, 10
delete from t1 where ST_Contains(@poly1, c2);
COMMIT;
--source include/kill_and_restart_mysqld.inc
--source include/restart_mysqld.inc
# Check table.
check table t1;

3
mysql-test/suite/innodb_gis/t/types.test
View File

@ -73,7 +73,8 @@ INSERT INTO t_wl6455 VALUES(11, POINT(11,11));
BEGIN;
INSERT INTO t_wl6455 VALUES(1, POINT(1,1));
--source include/kill_and_restart_mysqld.inc
--let $shutdown_timeout=0
--source include/restart_mysqld.inc
CHECK TABLE t_wl6455;
SELECT ST_AsText(g) FROM t_wl6455;