5 files changed, 31 insertions, 9 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index e876eb2264d..e20eb4e0869 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -128,7 +128,7 @@ DO_GDB=""
 DO_DDD=""
 DO_CLIENT_GDB=""
 SLEEP_TIME=2
-CHARACTER_SET=latin1_de
+CHARACTER_SET=latin1
 DBUSER=""
 
 while test $# -gt 0; do
diff --git a/mysql-test/r/ctype_latin1_de.result b/mysql-test/r/ctype_latin1_de.result
index 71bed79891a..44a1757209e 100644
--- a/mysql-test/r/ctype_latin1_de.result
+++ b/mysql-test/r/ctype_latin1_de.result
@@ -9,6 +9,8 @@ aeae	33
 ääa	32
 aeb	6
 Äc	5
+é	38
+É	39
 eä	28
 o	37
 oc	15
@@ -36,8 +38,6 @@ ueb	12
 üc	7
 uf	13
 uü	29
-é	38
-É	39
 a	b
 a	35
 ac	2
@@ -49,6 +49,8 @@ aeae	33
 ääa	32
 aeb	6
 Äc	5
+é	38
+É	39
 eä	28
 o	37
 oc	15
@@ -76,11 +78,7 @@ ueb	12
 üc	7
 uf	13
 uü	29
-é	38
-É	39
 a
-É
-é
 uü
 uf
 üc
@@ -108,6 +106,8 @@ od
 oc
 o
 eä
+É
+é
 Äc
 aeb
 ääa
@@ -121,11 +121,11 @@ a
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 a	b
+ö	14
 Öa	16
 Öc	19
 öo	30
 a	b
-é	38
 É	39
 a	b
 a	35
@@ -166,3 +166,10 @@ strcmp('ßa','ss')	strcmp('ssa','ß')	strcmp('sssb','sßa')	strcmp('ß','s')
 1	1	1	1
 strcmp('u','öa')	strcmp('u','ö')
 1	1
+a
+abc
+abcd
+a
+test
+a
+test
diff --git a/mysql-test/r/func_like.result b/mysql-test/r/func_like.result
index 78bede19762..a6c28daae88 100644
--- a/mysql-test/r/func_like.result
+++ b/mysql-test/r/func_like.result
@@ -2,6 +2,9 @@ a
 abc
 abcd
 a
+abc
+abcd
+a
 test
 a
 test
diff --git a/mysql-test/t/ctype_latin1_de.test b/mysql-test/t/ctype_latin1_de.test
index 1df700340da..d39d7f6e5dd 100644
--- a/mysql-test/t/ctype_latin1_de.test
+++ b/mysql-test/t/ctype_latin1_de.test
@@ -14,7 +14,7 @@ select a,b from t1 order by upper(a),b;
 select a from t1 order by a desc;
 check table t1;
 select * from t1 where a like "ö%";
-select * from t1 where a like "%É%";
+select * from t1 where a like binary "%É%";
 select * from t1 where a like "%Á%";
 select * from t1 where a like "%U%";
 select * from t1 where a like "%ss%";
@@ -34,3 +34,13 @@ select strcmp('af','ä'),strcmp('ä','a'),strcmp('aeq','ää'),strcmp('aeaeq','ää');
 select strcmp('ßa','ss'),strcmp('ssa','ß'),strcmp('sssb','sßa'),strcmp('ß','s');
 select strcmp('u','öa'),strcmp('u','ö');
 
+#
+# Some other simple tests with the current character set
+#
+
+create table t1 (a varchar(10), key(a));
+insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test");
+select * from t1 where a like "abc%"; 
+select * from t1 where a like "test%"; 
+select * from t1 where a like "te_t"; 
+drop table t1;
diff --git a/mysql-test/t/func_like.test b/mysql-test/t/func_like.test
index d160b04176c..e0f1f0db9ce 100644
--- a/mysql-test/t/func_like.test
+++ b/mysql-test/t/func_like.test
@@ -2,9 +2,11 @@
 # Test of like
 #
 
+drop table if exists t1;
 create table t1 (a varchar(10), key(a));
 insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test");
 select * from t1 where a like "abc%"; 
+select * from t1 where a like "ABC%"; 
 select * from t1 where a like "test%"; 
 select * from t1 where a like "te_t"; 
 drop table t1;