From 4c59fceab0348d0375811c9968d4d779d5e018b2 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 2 Oct 2006 13:47:18 +0200
Subject: [PATCH] Remove faulty merge causing ctype_utf8 failure

---
 mysql-test/r/ctype_utf8.result | 12 ------------
 mysql-test/t/ctype_utf8.test   | 17 -----------------
 2 files changed, 29 deletions(-)

diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 22b6de80a35..a6eeabb83ef 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -1340,18 +1340,6 @@ select a from t1 group by a;
 a
 e
 drop table t1;
-set names utf8;
-grant select on test.* to юзер_юзер@localhost;
-user()
-юзер_юзер@localhost
-revoke all on test.* from юзер_юзер@localhost;
-drop user юзер_юзер@localhost;
-create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-select database();
-database()
-имя_базы_в_кодировке_утф8_длиной_больше_чем_45
-drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
 use test;
 create table t1(a char(10)) default charset utf8;
 insert into t1 values ('123'), ('456');
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index cb34d51e3cb..4e2bb6a7d66 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1073,23 +1073,6 @@ select a from t1 group by a;
 drop table t1;
 
 
-#
-# Bug#20393: User name truncation in mysql client
-# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
-#
-set names utf8;
-#create user юзер_юзер@localhost;
-grant select on test.* to юзер_юзер@localhost;
---exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()"
-revoke all on test.* from юзер_юзер@localhost;
-drop user юзер_юзер@localhost;
-
-create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-select database();
-drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
-use test;
-
 #
 # Bug #20204: "order by" changes the results returned
 #