summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-05-18 01:20:23 +0200
committerSergei Golubchik <serg@mariadb.org>2022-05-18 01:22:29 +0200
commit74068dd2ac9e2cc221e226d6412825f2d4f3dd40 (patch)
treebfa5c5ef7d2171364bbb923b92d3314909382339
parentc9b5a05341d7342db5f369493ea200b5fb9db243 (diff)
downloadmariadb-git-74068dd2ac9e2cc221e226d6412825f2d4f3dd40.tar.gz
fix tests for embedded
followup for c9b5a05341d7
-rw-r--r--mysql-test/suite/compat/oracle/r/events.result9
-rw-r--r--mysql-test/suite/compat/oracle/r/sp.result7
-rw-r--r--mysql-test/suite/compat/oracle/t/events.test10
-rw-r--r--mysql-test/suite/compat/oracle/t/sp.test7
4 files changed, 18 insertions, 15 deletions
diff --git a/mysql-test/suite/compat/oracle/r/events.result b/mysql-test/suite/compat/oracle/r/events.result
index ef9c50115ae..1f62e2e5ee2 100644
--- a/mysql-test/suite/compat/oracle/r/events.result
+++ b/mysql-test/suite/compat/oracle/r/events.result
@@ -16,3 +16,12 @@ COUNT(*)
1
DROP TABLE t1;
SET GLOBAL event_scheduler=off;
+#
+# MDEV-28588 SIGSEGV in __memmove_avx_unaligned_erms, strmake_root
+#
+CREATE EVENT ev ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO BEGIN END;
+Warnings:
+Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
+SELECT EVENT_DEFINITION FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='test' AND EVENT_NAME='ev';
+EVENT_DEFINITION BEGIN END
+DROP EVENT ev;
diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result
index 5756db4fc5b..e11e0404dd1 100644
--- a/mysql-test/suite/compat/oracle/r/sp.result
+++ b/mysql-test/suite/compat/oracle/r/sp.result
@@ -2565,13 +2565,6 @@ DROP PROCEDURE p1;
#
SET sql_mode=ORACLE;
BEGIN END;
-SET sql_mode=ORACLE;
-CREATE EVENT ev ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO BEGIN END;
-Warnings:
-Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
-SELECT EVENT_DEFINITION FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='test' AND EVENT_NAME='ev';
-EVENT_DEFINITION BEGIN END
-DROP EVENT ev;
CREATE TABLE t1 (a INT);
CREATE TRIGGER tr AFTER INSERT ON t1 FOR EACH ROW BEGIN END;
SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_SCHEMA='test' AND TRIGGER_NAME='tr';
diff --git a/mysql-test/suite/compat/oracle/t/events.test b/mysql-test/suite/compat/oracle/t/events.test
index e898528636a..fb56af51d87 100644
--- a/mysql-test/suite/compat/oracle/t/events.test
+++ b/mysql-test/suite/compat/oracle/t/events.test
@@ -25,5 +25,13 @@ let $wait_condition =
SELECT COUNT(*) FROM t1;
DROP TABLE t1;
-
SET GLOBAL event_scheduler=off;
+
+--echo #
+--echo # MDEV-28588 SIGSEGV in __memmove_avx_unaligned_erms, strmake_root
+--echo #
+CREATE EVENT ev ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO BEGIN END;
+--vertical_results
+SELECT EVENT_DEFINITION FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='test' AND EVENT_NAME='ev';
+--horizontal_results
+DROP EVENT ev;
diff --git a/mysql-test/suite/compat/oracle/t/sp.test b/mysql-test/suite/compat/oracle/t/sp.test
index ca99739533f..945968d9512 100644
--- a/mysql-test/suite/compat/oracle/t/sp.test
+++ b/mysql-test/suite/compat/oracle/t/sp.test
@@ -2406,13 +2406,6 @@ DROP PROCEDURE p1;
SET sql_mode=ORACLE;
BEGIN END;
-SET sql_mode=ORACLE;
-CREATE EVENT ev ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR DO BEGIN END;
---vertical_results
-SELECT EVENT_DEFINITION FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA='test' AND EVENT_NAME='ev';
---horizontal_results
-DROP EVENT ev;
-
CREATE TABLE t1 (a INT);
CREATE TRIGGER tr AFTER INSERT ON t1 FOR EACH ROW BEGIN END;
--vertical_results