diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-16 12:12:26 +0300 |
| commit | af912664989e0c3ee9cdb6caf8ec439029e7405c (patch) | |
| tree | 9ab694ec5d18e0ab998eb4f52ee86129e5fbd3ae /mysql-test/suite/compat | |
| parent | 5679a2b6b342abc9d80bcf784a1a35f240be9d87 (diff) | |
| parent | 6577a7a8f20538df80b851698e21095311aae190 (diff) | |
| download | mariadb-git-af912664989e0c3ee9cdb6caf8ec439029e7405c.tar.gz | |
Merge 10.3 into 10.4
In main.index_merge_myisam we remove the test that was added in
commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because
it duplicates the test case that was added in
commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
Diffstat (limited to 'mysql-test/suite/compat')
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp-cursor-decl.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp-cursor.result | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-cursor-decl.result b/mysql-test/suite/compat/oracle/r/sp-cursor-decl.result index b75b5d5be9d..275e575620b 100644 --- a/mysql-test/suite/compat/oracle/r/sp-cursor-decl.result +++ b/mysql-test/suite/compat/oracle/r/sp-cursor-decl.result @@ -102,7 +102,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp BEGIN var1:=''; insert into t1 values (1); -SELE' at line 10 +S...' at line 10 drop table t1; # # Condition after handler declaration @@ -130,7 +130,7 @@ $$ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'divide_by_zero CONDITION FOR SQLSTATE '22012'; BEGIN var1:=''; -insert into t1 va' at line 11 +insert into t1...' at line 11 drop table t1; # # Variable after handler declaration @@ -158,7 +158,7 @@ $$ ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'divide_by_zero CONDITION FOR SQLSTATE '22012'; BEGIN var1:=''; -insert into t1 va' at line 11 +insert into t1...' at line 11 drop table t1; # # Variable after cursor (inner block) diff --git a/mysql-test/suite/compat/oracle/r/sp-cursor.result b/mysql-test/suite/compat/oracle/r/sp-cursor.result index a09459ad7cd..2e0c43c8b87 100644 --- a/mysql-test/suite/compat/oracle/r/sp-cursor.result +++ b/mysql-test/suite/compat/oracle/r/sp-cursor.result @@ -776,7 +776,7 @@ FETCH c INTO a, b; EXIT WHEN c%NOTFOUND; SELECT a, b; END LOOP; -CLOSE ' at line 5 +CLO...' at line 5 DROP TABLE t1; # # MDEV-10577 sql_mode=ORACLE: %TYPE in variable declarations |