[Commits] db6f3d4: postreview fix

OleksandrByelkin sanja at mariadb.com
Tue Dec 15 15:08:09 EET 2015


revision-id: db6f3d4805468924f2f782f0166ec97121aa7c08 (mariadb-10.0.22-65-gdb6f3d4)
parent(s): 574515c8e72ee801a746edf3cf9e0702ecdadc83
committer: Oleksandr Byelkin
timestamp: 2015-12-15 14:08:09 +0100
message:

postreview fix

---
 mysql-test/r/dyncol.result | 10 ++++++++++
 mysql-test/t/dyncol.test   |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/mysql-test/r/dyncol.result b/mysql-test/r/dyncol.result
index 72a468c..c7eb303 100644
--- a/mysql-test/r/dyncol.result
+++ b/mysql-test/r/dyncol.result
@@ -1848,5 +1848,15 @@ select column_json(column_create('float', 1.23456789012345E+10 as double));
 column_json(column_create('float', 1.23456789012345E+10 as double))
 {"float":12345678901.2345}
 #
+# MDEV-9147: Character set is ignored in Dynamic Column for saved string
+#
+SET NAMES utf8;
+SELECT COLUMN_GET(COLUMN_CREATE(1, 0xC2A2 AS CHAR CHARACTER SET latin1), 1 AS CHAR CHARACTER SET utf8) AS a;
+a
+¢
+SELECT COLUMN_GET(COLUMN_CREATE(1, 0xC2A2 AS CHAR CHARACTER SET utf8), 1 AS CHAR CHARACTER SET utf8) AS a;
+a
+¢
+#
 # end of 10.0 tests
 #
diff --git a/mysql-test/t/dyncol.test b/mysql-test/t/dyncol.test
index 0f4058d..f0b8e04 100644
--- a/mysql-test/t/dyncol.test
+++ b/mysql-test/t/dyncol.test
@@ -902,5 +902,12 @@ select column_json(column_create('float', 1.23456789012345E+100 as double));
 select column_json(column_create('float', 1.23456789012345E+10 as double));
 
 --echo #
+--echo # MDEV-9147: Character set is ignored in Dynamic Column for saved string
+--echo #
+SET NAMES utf8;
+SELECT COLUMN_GET(COLUMN_CREATE(1, 0xC2A2 AS CHAR CHARACTER SET latin1), 1 AS CHAR CHARACTER SET utf8) AS a;
+SELECT COLUMN_GET(COLUMN_CREATE(1, 0xC2A2 AS CHAR CHARACTER SET utf8), 1 AS CHAR CHARACTER SET utf8) AS a; 
+
+--echo #
 --echo # end of 10.0 tests
 --echo #


More information about the commits mailing list