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_update.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_update.result')
| -rw-r--r-- | mysql-test/r/ndb_update.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_update.result b/mysql-test/r/ndb_update.result index c2247564e65..164d1bd700c 100644 --- a/mysql-test/r/ndb_update.result +++ b/mysql-test/r/ndb_update.result @@ -18,7 +18,7 @@ pk1 b c 2 2 2 4 1 1 UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4; -ERROR 23000: Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '' for key 0 select * from t1 order by pk1; pk1 b c 0 0 0 |