Commit 0ff6776c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-4.1.13-clone 

into mysql.com:/space/my/mysql-5.0-build


mysql-test/t/ctype_utf8.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 77509050 297f80ed

mysql-test/t/ctype_utf8.test

+2 −0
Original line number Diff line number Diff line
@@ -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');