diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
commit | 9a0b9e336081619d88211d17895e3e7f8030ab3f (patch) | |
tree | dff672703c5309b1e34227330ea027ab13e6c29a /mysql-test/main/ctype_ucs.result | |
parent | 2f7a0072b6f343051fc2dbd77ea46519617b94ab (diff) | |
parent | 667d3fbbb51044b20d23150992adbbad1f04aad8 (diff) | |
download | mariadb-git-9a0b9e336081619d88211d17895e3e7f8030ab3f.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/ctype_ucs.result')
-rw-r--r-- | mysql-test/main/ctype_ucs.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index 804e8ff4c68..ce0d695797b 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -6398,6 +6398,17 @@ DEALLOCATE PREPARE stmt; # End of 10.2 tests # # +# Start of 10.3 tests +# +# +# MDEV-14983 Wrong error message with SET sql_mode=sha2(ucs2_value) +# +SET sql_mode=sha2(CONVERT('a' USING ucs2),0); +ERROR 42000: Variable 'sql_mode' can't be set to the value of '022a6979e6dab7aa5ae4c3e5e45f7e977112a7e63593820dbec1ec738a24f93c' +# +# End of 10.3 tests +# +# # Start of 10.4 tests # # |