From be04bf55248cb742acc18bcbe405691edc2b7fa4 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com/bar.myoffice.izhnet.ru>
Date: Fri, 3 Aug 2007 15:57:14 +0500
Subject: [PATCH] After merge fix

---
 mysql-test/r/ctype_ucs.result | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index e45d6c9b60b..023267c227c 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -895,6 +895,7 @@ hex(s2)
 select hex(convert(s1 using latin1)) from t1;
 hex(convert(s1 using latin1))
 7F
+drop table t1;
 create table t1 (a varchar(15) character set ascii not null, b int);
 insert into t1 values ('a',1);
 select concat(a,if(b<10,_ucs2 0x0061,_ucs2 0x0062)) from t1;