From db9a12a6cf888b0c63f1db61eb731a693dd42d02 Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Mon, 5 Mar 2018 09:06:58 +0200 Subject: [PATCH] Added spatial (GEOMETRY, POINT) tests --- localtests/geometry57/create.sql | 21 +++++++++++++++++++++ localtests/geometry57/ignore_versions | 1 + localtests/spatial57/create.sql | 22 ++++++++++++++++++++++ localtests/spatial57/ignore_versions | 1 + localtests/test.sh | 5 +++++ 5 files changed, 50 insertions(+) create mode 100644 localtests/geometry57/create.sql create mode 100644 localtests/geometry57/ignore_versions create mode 100644 localtests/spatial57/create.sql create mode 100644 localtests/spatial57/ignore_versions diff --git a/localtests/geometry57/create.sql b/localtests/geometry57/create.sql new file mode 100644 index 0000000..6dd64c6 --- /dev/null +++ b/localtests/geometry57/create.sql @@ -0,0 +1,21 @@ +drop table if exists gh_ost_test; +create table gh_ost_test ( + id int auto_increment, + g geometry, + primary key(id) +) auto_increment=1; + +drop event if exists gh_ost_test; +delimiter ;; +create event gh_ost_test + on schedule every 1 second + starts current_timestamp + ends current_timestamp + interval 60 second + on completion not preserve + enable + do +begin + insert into gh_ost_test values (null, ST_GeomFromText('POINT(1 1)')); + insert into gh_ost_test values (null, ST_GeomFromText('POINT(2 2)')); + insert into gh_ost_test values (null, ST_GeomFromText('POINT(3 3)')); +end ;; diff --git a/localtests/geometry57/ignore_versions b/localtests/geometry57/ignore_versions new file mode 100644 index 0000000..b6de5f8 --- /dev/null +++ b/localtests/geometry57/ignore_versions @@ -0,0 +1 @@ +(5.5|5.6) diff --git a/localtests/spatial57/create.sql b/localtests/spatial57/create.sql new file mode 100644 index 0000000..bb213d5 --- /dev/null +++ b/localtests/spatial57/create.sql @@ -0,0 +1,22 @@ +drop table if exists gh_ost_test; +create table gh_ost_test ( + id int auto_increment, + g geometry, + pt point, + primary key(id) +) auto_increment=1; + +drop event if exists gh_ost_test; +delimiter ;; +create event gh_ost_test + on schedule every 1 second + starts current_timestamp + ends current_timestamp + interval 60 second + on completion not preserve + enable + do +begin + insert into gh_ost_test values (null, ST_GeomFromText('POINT(1 1)'), POINT(10,10)); + insert into gh_ost_test values (null, ST_GeomFromText('POINT(2 2)'), POINT(20,20)); + insert into gh_ost_test values (null, ST_GeomFromText('POINT(3 3)'), POINT(30,30)); +end ;; diff --git a/localtests/spatial57/ignore_versions b/localtests/spatial57/ignore_versions new file mode 100644 index 0000000..b6de5f8 --- /dev/null +++ b/localtests/spatial57/ignore_versions @@ -0,0 +1 @@ +(5.5|5.6) diff --git a/localtests/test.sh b/localtests/test.sh index 8d5ee35..80bacaa 100755 --- a/localtests/test.sh +++ b/localtests/test.sh @@ -41,6 +41,11 @@ verify_master_and_replica() { read master_host master_port <<< $(gh-ost-test-mysql-master -e "select @@hostname, @@port" -ss) [ "$master_host" == "$(hostname)" ] && master_host="127.0.0.1" echo "# master verified at $master_host:$master_port" + if ! gh-ost-test-mysql-master -e "set global event_scheduler := 1" ; then + echo "Cannot enable event_scheduler on master" + exit 1 + fi + if [ "$(gh-ost-test-mysql-replica -e "select 1" -ss)" != "1" ] ; then echo "Cannot verify gh-ost-test-mysql-replica" exit 1