diff options
author | unknown <bar@mysql.com> | 2005-10-13 19:19:05 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-10-13 19:19:05 +0500 |
commit | 842fd992f6d6b2a9575e8a7dd16f374fb6842338 (patch) | |
tree | a73fcc3c0ebfb9135114b842b2096b267ae08e5d /mysql-test/r/cast.result | |
parent | 99ed34376fde520a135756480334090db2a609a5 (diff) | |
parent | 60e411eb32fd31135cf805202a302bc7a050b757 (diff) | |
download | mariadb-git-842fd992f6d6b2a9575e8a7dd16f374fb6842338.tar.gz |
Merge abarkov@bk-internal:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.b9278
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
Diffstat (limited to 'mysql-test/r/cast.result')
-rw-r--r-- | mysql-test/r/cast.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index 7bf710f3491..6246d574a82 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -231,7 +231,7 @@ t1 CREATE TABLE `t1` ( `c5` varchar(2) character set utf8 NOT NULL default '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; -create table t1 (a binary(10), b char(10) character set koi8r); +create table t1 (a binary(4), b char(4) character set koi8r); insert into t1 values (_binary'ΤΕΣΤ',_binary'ΤΕΣΤ'); select a,b,cast(a as char character set cp1251),cast(b as binary) from t1; a b cast(a as char character set cp1251) cast(b as binary) |