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/main/signal.result | |
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/main/signal.result')
-rw-r--r-- | mysql-test/main/signal.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/signal.result b/mysql-test/main/signal.result index e329c58a47e..40b1609fc26 100644 --- a/mysql-test/main/signal.result +++ b/mysql-test/main/signal.result @@ -2358,21 +2358,21 @@ DECLARE céèçà foo CONDITION FOR SQLSTATE '12345'; SIGNAL céèçà SET MYSQL_ERRNO = 1000; end $$ 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 '©Ã¨Ã§Ã foo CONDITION FOR SQLSTATE '12345'; -SIGNAL céèçà SET ' at line 3 +SIGNAL céèçà S...' at line 3 create procedure test_signal() begin DECLARE "céèçà " CONDITION FOR SQLSTATE '12345'; SIGNAL "céèçà " SET MYSQL_ERRNO = 1000; end $$ 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 '"céèçà " CONDITION FOR SQLSTATE '12345'; -SIGNAL "céèçà " S' at line 3 +SIGNAL "céèçà ...' at line 3 create procedure test_signal() begin DECLARE 'céèçà ' CONDITION FOR SQLSTATE '12345'; SIGNAL 'céèçà ' SET MYSQL_ERRNO = 1000; end $$ 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 ''céèçà ' CONDITION FOR SQLSTATE '12345'; -SIGNAL 'céèçà ' S' at line 3 +SIGNAL 'céèçà ...' at line 3 create procedure test_signal() begin DECLARE `céèçà ` CONDITION FOR SQLSTATE '12345'; |