diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 14:14:59 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 14:14:59 +0200 |
| commit | dba319047450dde32b21a30aa8c66ee1f4468c92 (patch) | |
| tree | a7a57277d1d21e7ca34467091cf7472105d66323 /mysql-test | |
| parent | 951dacdcf17bcf875bf6c7559cfce578760b38d9 (diff) | |
| parent | 2a48132e01d6a52559cd6e9ad9145c9484e00c24 (diff) | |
| download | mariadb-git-dba319047450dde32b21a30aa8c66ee1f4468c92.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/ctype_utf8.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test index 151bd91feb9..a135c8e409d 100644 --- a/mysql-test/t/ctype_utf8.test +++ b/mysql-test/t/ctype_utf8.test @@ -785,12 +785,14 @@ INSERT INTO t1 VALUES (1,'blah','464','aaa','fkc1c9ilc20x0hgae7lx6j09','ERR','ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми','ИМРИ.АФИМИМ.АЕИМИМРИМДМРИМРМРИРОР',3,'2005-06-01 17:30:43','1234567890'), (2,'blah','464','aaa','haxpl2ilc20x00bj4tt2m5ti','11','11 g','G',3,'2005-06-02 22:43:10','1234567890'); +--disable_warnings CREATE TABLE t2 ( `msisdn` varchar(15) NOT NULL default '', `operator_id` int(11) NOT NULL default '0', `created` datetime NOT NULL default '0000-00-00 00:00:00', UNIQUE KEY `PK_user` (`msisdn`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +--enable_warnings INSERT INTO t2 VALUES ('1234567890',2,'2005-05-24 13:53:25'); |