diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-02 14:05:36 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-02 14:05:36 +0200 |
commit | c71ecd928fcf85428dc2f51d0bb227c82bb6417c (patch) | |
tree | a6695b5fb8e7a30457c146338977fef98a9485b1 /mysql-test | |
parent | 5bd5f55eee390dc0bc06be57e05a90264673b615 (diff) | |
download | mariadb-git-c71ecd928fcf85428dc2f51d0bb227c82bb6417c.tar.gz |
Remove faulty merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/ctype_utf8.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result index a6eeabb83ef..2862d6ad650 100644 --- a/mysql-test/r/ctype_utf8.result +++ b/mysql-test/r/ctype_utf8.result @@ -1340,7 +1340,6 @@ select a from t1 group by a; a e drop table t1; -use test; create table t1(a char(10)) default charset utf8; insert into t1 values ('123'), ('456'); explain |