diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:25:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 01:25:30 +0200 |
| commit | 23ddc3518f999e003d54f7a069b63b73585588aa (patch) | |
| tree | 2480b1ff4db3b8b2efae50bd9be0538393729894 /mysql-test/suite/compat | |
| parent | 4dffa7b5c5baadf95e01d7d595b4ae0dab5965cf (diff) | |
| parent | a0d4f0f306c6e478a1f45727e8fd9c867f9672d9 (diff) | |
| download | mariadb-git-23ddc3518f999e003d54f7a069b63b73585588aa.tar.gz | |
Merge branch '10.3' into 10.4mariadb-10.4.25
Diffstat (limited to 'mysql-test/suite/compat')
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/events.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp.result | 13 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/t/events.test | 10 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/t/sp.test | 16 |
4 files changed, 45 insertions, 3 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 4b360241c01..d462ee862c5 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -2553,7 +2553,18 @@ idx 1 DROP PROCEDURE p1; # -# Start of 10.4 tests +# MDEV-28588 SIGSEGV in __memmove_avx_unaligned_erms, strmake_root +# +SET sql_mode=ORACLE; +BEGIN END; +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'; +ACTION_STATEMENT BEGIN END +DROP TRIGGER tr; +DROP TABLE t1; +# +# End of 10.3 tests # # # MDEV-19637 Crash on an SP variable assignment to a wrong subselect 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 04b9f1be1e2..1e1954a5997 100644 --- a/mysql-test/suite/compat/oracle/t/sp.test +++ b/mysql-test/suite/compat/oracle/t/sp.test @@ -2392,9 +2392,23 @@ DROP PROCEDURE p1; --echo # ---echo # Start of 10.4 tests +--echo # MDEV-28588 SIGSEGV in __memmove_avx_unaligned_erms, strmake_root --echo # +SET sql_mode=ORACLE; +BEGIN END; + +CREATE TABLE t1 (a INT); +CREATE TRIGGER tr AFTER INSERT ON t1 FOR EACH ROW BEGIN END; +--vertical_results +SELECT ACTION_STATEMENT FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_SCHEMA='test' AND TRIGGER_NAME='tr'; +--horizontal_results +DROP TRIGGER tr; +DROP TABLE t1; + +--echo # +--echo # End of 10.3 tests +--echo # --echo # --echo # MDEV-19637 Crash on an SP variable assignment to a wrong subselect |