summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.(none)>2004-09-09 16:34:25 +0000
committerunknown <tomas@poseidon.(none)>2004-09-09 16:34:25 +0000
commit96a45ab0663a6172c1c198179188f9db7ec8c5c3 (patch)
treed7798c441d4ce83b31fc912c700be98093d6df82 /mysql-test/r
parent647d895acc1eae944e058dea715333962afaf4d0 (diff)
parent8d1e535e4a855eca4dbe3caeda18b9e932f7baa8 (diff)
downloadmariadb-git-96a45ab0663a6172c1c198179188f9db7ec8c5c3.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/ctype_tis620.result4
1 files changed, 2 insertions, 2 deletions
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 ')