Skip to content

Commit a54692a

Browse files
committed
main.ctype_utf8 test fix for cursor protocol
Cursor protocol requires results to be simple.
1 parent db59bb6 commit a54692a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mysql-test/main/ctype_utf8.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11658,8 +11658,8 @@ Warning 1292 Truncated incorrect INTEGER value: 'яяя'
1165811658
# MDEV-28118 Wrong collation of `CAST(.. AS CHAR COLLATE DEFAULT)`
1165911659
#
1166011660
SET NAMES utf8mb3 COLLATE utf8mb3_bin;
11661-
SELECT COLLATION(CAST('a' AS CHAR COLLATE DEFAULT));
11662-
COLLATION(CAST('a' AS CHAR COLLATE DEFAULT))
11661+
SELECT COLLATION(CAST('a' AS CHAR COLLATE DEFAULT)) AS c1;
11662+
c1
1166311663
utf8mb3_general_ci
1166411664
CREATE TABLE t1 AS SELECT CAST('a' AS CHAR COLLATE DEFAULT) AS c1;
1166511665
SHOW CREATE TABLE t1;

mysql-test/main/ctype_utf8.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2544,7 +2544,7 @@ SELECT CAST(_utf8 'яяя' AS INT);
25442544
--echo #
25452545

25462546
SET NAMES utf8mb3 COLLATE utf8mb3_bin;
2547-
SELECT COLLATION(CAST('a' AS CHAR COLLATE DEFAULT));
2547+
SELECT COLLATION(CAST('a' AS CHAR COLLATE DEFAULT)) AS c1;
25482548
CREATE TABLE t1 AS SELECT CAST('a' AS CHAR COLLATE DEFAULT) AS c1;
25492549
SHOW CREATE TABLE t1;
25502550
DROP TABLE t1;

0 commit comments

Comments
 (0)