From 8d1e535e4a855eca4dbe3caeda18b9e932f7baa8 Mon Sep 17 00:00:00 2001 From: unknown <bar@mysql.com> Date: Thu, 9 Sep 2004 18:44:53 +0500 Subject: [PATCH] Bug #5430 ctype_tis620 test failure BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14: Delete: mysql-test/t/ctype_tis620-master.opt --- mysql-test/r/ctype_tis620.result | 4 ++-- mysql-test/t/ctype_tis620-master.opt | 1 - mysql-test/t/ctype_tis620.test | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 mysql-test/t/ctype_tis620-master.opt diff --git a/mysql-test/r/ctype_tis620.result b/mysql-test/r/ctype_tis620.result index 94c4b295713..1fece515f9f 100644 --- a/mysql-test/r/ctype_tis620.result +++ b/mysql-test/r/ctype_tis620.result @@ -116,7 +116,7 @@ CREATE TABLE t1 ( recid int(11) NOT NULL auto_increment, dyninfo text, PRIMARY KEY (recid) -) ENGINE=MyISAM; +) ENGINE=MyISAM CHARACTER SET tis620; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -2890,7 +2890,7 @@ SELECT 'a\t' < 'a'; SELECT 'a\t' < 'a '; 'a\t' < 'a ' 1 -CREATE TABLE t1 (a char(10) not null); +CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; hex(a) STRCMP(a,'a') STRCMP(a,'a ') diff --git a/mysql-test/t/ctype_tis620-master.opt b/mysql-test/t/ctype_tis620-master.opt deleted file mode 100644 index 69d47c06e42..00000000000 --- a/mysql-test/t/ctype_tis620-master.opt +++ /dev/null @@ -1 +0,0 @@ ---default-character-set=tis620 diff --git a/mysql-test/t/ctype_tis620.test b/mysql-test/t/ctype_tis620.test index 9bffc2b7ab8..92a9eada05f 100644 --- a/mysql-test/t/ctype_tis620.test +++ b/mysql-test/t/ctype_tis620.test @@ -69,7 +69,7 @@ CREATE TABLE t1 ( recid int(11) NOT NULL auto_increment, dyninfo text, PRIMARY KEY (recid) -) ENGINE=MyISAM; +) ENGINE=MyISAM CHARACTER SET tis620; show create table t1; @@ -112,7 +112,7 @@ SELECT 'a\0' < 'a '; SELECT 'a\t' < 'a'; SELECT 'a\t' < 'a '; -CREATE TABLE t1 (a char(10) not null); +CREATE TABLE t1 (a char(10) not null) CHARACTER SET tis620; INSERT INTO t1 VALUES ('a'),('a\0'),('a\t'),('a '); SELECT hex(a),STRCMP(a,'a'), STRCMP(a,'a ') FROM t1; DROP TABLE t1; -- 2.30.9