summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@rakia.(none)>2006-07-26 11:56:39 +0300
committerunknown <gkodinov/kgeorge@rakia.(none)>2006-07-26 11:56:39 +0300
commit380911708448ff8e90b55f219429d0fda13ed217 (patch)
tree2f38b57f0ad9b2dbf9300c5eb0c0643951d14b0f /mysql-test/r
parentbeb6f57c413fb714bf035f9850c9c4358b508a75 (diff)
parent1b3cdb6085c944e1c371779d4d4b6473ebcd116d (diff)
downloadmariadb-git-380911708448ff8e90b55f219429d0fda13ed217.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.(none):/home/kgeorge/mysql/autopush/B21086-5.0-opt
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/view.result13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c8a673e2209..b2c65423b59 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2807,3 +2807,16 @@ yadda
yad
DROP VIEW v1;
DROP TABLE t1;
+CREATE TABLE t1 (s1 char);
+INSERT INTO t1 VALUES ('Z');
+CREATE VIEW v1 AS SELECT s1 collate latin1_german1_ci AS col FROM t1;
+CREATE VIEW v2 (col) AS SELECT s1 collate latin1_german1_ci FROM t1;
+INSERT INTO v1 (col) VALUES ('b');
+INSERT INTO v2 (col) VALUES ('c');
+SELECT s1 FROM t1;
+s1
+Z
+b
+c
+DROP VIEW v1, v2;
+DROP TABLE t1;