diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-18 14:28:18 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-10-18 14:28:18 +0200 |
| commit | 55ae6636bd7005d2dbd485087b52e0082ea3f87e (patch) | |
| tree | 01b4222f044ce786b0dd514ddb7d75a35890d52e /mysql-test/r/ndb_charset.result | |
| parent | 4416725b34e9f075cf0087b71b037db72e6075ea (diff) | |
| parent | 63814890d1126e042ddf2cccb88fe07a1331d997 (diff) | |
| download | mariadb-git-55ae6636bd7005d2dbd485087b52e0082ea3f87e.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_charset.result')
| -rw-r--r-- | mysql-test/r/ndb_charset.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ndb_charset.result b/mysql-test/r/ndb_charset.result index 3763e20e59a..9e519c39496 100644 --- a/mysql-test/r/ndb_charset.result +++ b/mysql-test/r/ndb_charset.result @@ -112,9 +112,9 @@ unique key(a) ) engine=ndb; insert into t1 values(1, 'aAa'); insert into t1 values(2, 'aaa'); -ERROR 23000: Duplicate entry '2' for key 1 +ERROR 23000: Duplicate entry '' for key 0 insert into t1 values(3, 'AAA'); -ERROR 23000: Duplicate entry '3' for key 1 +ERROR 23000: Duplicate entry '' for key 0 select * from t1 order by p; p a 1 aAa @@ -138,9 +138,9 @@ unique key(a) ) engine=ndb; insert into t1 values (1,'A'),(2,'b '),(3,'C '),(4,'d '),(5,'E'),(6,'f'); insert into t1 values(99,'b'); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '' for key 0 insert into t1 values(99,'a '); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '' for key 0 select a,length(a) from t1 order by a; a length(a) A 1 |