diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
| commit | 5f8561a6bcdb66e05ca539365cce33a9fc1817a2 (patch) | |
| tree | 3ceb20e3e0e8fc1a0759199ccdf7238f31fd4267 /mysql-test/main/sp-code.result | |
| parent | 3c2ab896b9642c43805a5dfc174c81fc5f902db0 (diff) | |
| parent | 489ef007bec398c3b7b628325b225c3a015922cf (diff) | |
| download | mariadb-git-5f8561a6bcdb66e05ca539365cce33a9fc1817a2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/sp-code.result')
| -rw-r--r-- | mysql-test/main/sp-code.result | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/main/sp-code.result b/mysql-test/main/sp-code.result index f9cbdcce691..462c9f80263 100644 --- a/mysql-test/main/sp-code.result +++ b/mysql-test/main/sp-code.result @@ -972,6 +972,30 @@ DROP PROCEDURE testp_bug11763507; DROP FUNCTION testf_bug11763507; #END OF BUG#11763507 test. # +# MDEV-23408 Wrong result upon query from I_S and further Assertion `!alias_arg || strlen(alias_arg->str) == alias_arg->length' failed with certain connection charset +# +SET NAMES utf8; +SET SESSION character_set_connection=latin1; +CREATE PROCEDURE p1() +BEGIN +DECLARE a VARCHAR(10) CHARACTER SET utf8; +SET a='ä'; +SELECT a, 'ä' AS b; +END; +$$ +SHOW PROCEDURE CODE p1; +Pos Instruction +0 set a@0 NULL +1 set a@0 'ä' +2 stmt 0 "SELECT a, 'ä' AS b" +CALL p1; +a b +ä ä +DROP PROCEDURE p1; +# +# End of 10.2 tests +# +# # MDEV-13581 ROW TYPE OF t1 and t1%ROWTYPE for routine parameters # CREATE TABLE t1 (a INT, b TEXT); @@ -1330,6 +1354,9 @@ Pos Instruction 5 hpop 1 drop function f1; # +# End of 10.3 tests +# +# # MDEV-19640 Wrong SHOW PROCEDURE output for SET GLOBAL sysvar1=expr, sysvar2=expr # CREATE OR REPLACE PROCEDURE p1() @@ -1344,3 +1371,6 @@ Pos Instruction 1 stmt 31 "SET GLOBAL max_error_count=60" 2 stmt 0 "SELECT @@GLOBAL.max_allowed_packet, @..." DROP PROCEDURE p1; +# +# End of 10.5 tests +# |