Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 31 insertions, 0 deletions

diff --git a/mysql-test/suite/vcol/r/charsets.result b/mysql-test/suite/vcol/r/charsets.result
new file mode 100644
index 00000000..aeff00d3
--- /dev/null
+++ b/mysql-test/suite/vcol/r/charsets.result
@@ -0,0 +1,31 @@
+set names utf8;
+create table t1 (
+a int,
+b varchar(100) as (if(a,collation('й'),hex('ю')))
+) character set koi8r;
+insert t1 (a) values (0),(1);
+select * from t1;
+a	b
+0	C0
+1	koi8r_general_ci
+set names latin1;
+select * from t1;
+a	b
+0	C0
+1	koi8r_general_ci
+flush tables;
+select * from t1;
+a	b
+0	C0
+1	koi8r_general_ci
+set names koi8r;
+select * from t1;
+a	b
+0	C0
+1	koi8r_general_ci
+flush tables;
+select * from t1;
+a	b
+0	C0
+1	koi8r_general_ci
+drop table t1;