summaryrefslogtreecommitdiff
path: root/mysql-test/main/ctype_sjis.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2021-10-22 18:41:35 +0400
committerAlexander Barkov <bar@mariadb.com>2021-10-27 06:09:57 +0400
commite97b785d764f85009412947600195001be01a706 (patch)
tree6ef5ec6254429167b78f7d4af2314e15630c6343 /mysql-test/main/ctype_sjis.result
parentf9b856b0525dd9d82a9b42be690a26a295c73c64 (diff)
downloadmariadb-git-e97b785d764f85009412947600195001be01a706.tar.gz
MDEV-22380: Assertion `name.length == strlen(name.str)' failed ...bb-10.3-bar-MDEV-22380
Also fixes: MDEV-25399 Assertion `name.length == strlen(name.str)' failed in Item_func_sp::make_send_field Also fixes a problem that in this scenario: SET NAMES binary; SELECT 'some not well-formed utf8 string'; the auto-generated column name copied the binary string value directly to the Item name, without checking utf8 well-formedness. After this change auto-generated column names work as follows: - Zero bytes 0x00 are copied to the name using HEX notation - In case of "SET NAMES binary", all bytes sequences that do not make well-formed utf8 characters are copied to the name using HEX notation.
Diffstat (limited to 'mysql-test/main/ctype_sjis.result')
-rw-r--r--mysql-test/main/ctype_sjis.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/ctype_sjis.result b/mysql-test/main/ctype_sjis.result
index c897268b204..fdb24fdc0e5 100644
--- a/mysql-test/main/ctype_sjis.result
+++ b/mysql-test/main/ctype_sjis.result
@@ -18682,7 +18682,7 @@ SELECT @@character_set_client, @@character_set_connection, @@character_set_resul
@@character_set_client @@character_set_connection @@character_set_results
binary sjis binary
SELECT HEX('à\['), HEX('\à\[');
-HEX('à\[') HEX('\à\[')
+HEX('\xE0\[') HEX('\\xE0\[')
E05B E05B
CREATE TABLE t1 AS SELECT REPEAT(' ', 10) AS a LIMIT 0;
SHOW CREATE TABLE t1;