From 49b66418a0c35600839f8dda07bb70e248a392ea Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@alik.opbmk>
Date: Fri, 23 Feb 2007 20:49:01 +0300
Subject: [PATCH] Fix test for views with national characters, which
 accidentally got broken during the merge on 16-Feb-2007.

mysql-test/r/view.result:
  Updated result file.
mysql-test/t/view.test:
  Fix test for views with national characters,
  which accidentally got broken during the merge
  on 16-Feb-2007.

  Now view.test is in UTF8 character set,
  so SET NAMES is required.
---
 mysql-test/r/view.result | 18 ++++++++++--------
 mysql-test/t/view.test   | 14 ++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 6dad86712e4..34bcf37f091 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -834,14 +834,16 @@ show create view v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 99999999999999999999999999999999999999999999999999999 AS `col1`
 drop view v1;
-create table t (c char);
-create view v as select c from t;
-insert into v values ('');
-select * from v;
-c
-
-drop view v;
-drop table t;
+set names utf8;
+create table tü (cü char);
+create view vü as select cü from tü;
+insert into vü values ('ü');
+select * from vü;
+cü
+ü
+drop view vü;
+drop table tü;
+set names latin1;
 create table t1 (a int, b int);
 insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);
 create view v1(c) as select a+1 from t1 where b >= 4;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index d100630cf24..90a3c6a1e2d 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -748,12 +748,14 @@ drop view v1;
 #
 # VIEWs with national characters
 #
-create table t (c char);
-create view v as select c from t;
-insert into v values ('');
-select * from v;
-drop view v;
-drop table t;
+set names utf8;
+create table tü (cü char);
+create view vü as select cü from tü;
+insert into vü values ('ü');
+select * from vü;
+drop view vü;
+drop table tü;
+set names latin1;
 
 #
 # problem with used_tables() of outer reference resolved in VIEW