summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-10-26 09:34:32 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-10-26 09:34:32 +0300
commit825f88634bb78f7e62e27332b3da56ee5d3f9460 (patch)
treeccfebe632256bc7512b5bc8d27d46aceca868a44 /mysql-test
parentd9c06c2a64747ec0616f6de5d8cd7d42da3afc92 (diff)
downloadmariadb-git-825f88634bb78f7e62e27332b3da56ee5d3f9460.tar.gz
Fix results after Bug#12661768 fix.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/r/innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index edf3c7d2753..ad140cc59be 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -1305,7 +1305,7 @@ FOREIGN KEY (c1) REFERENCES t1 (c1) ON UPDATE CASCADE
INSERT INTO t1 VALUES ('old', 'somevalu'), ('other', 'anyvalue');
INSERT INTO t2 VALUES (10, 'old'), (20, 'other');
UPDATE t1 SET c1 = 'other' WHERE c1 = 'old';
-ERROR 23000: Upholding foreign key constraints for table 't1', entry '', key 2 would lead to a duplicate entry
+ERROR 23000: Upholding foreign key constraints for table 't1', entry 'other-somevalu', key 2 would lead to a duplicate entry
DROP TABLE t2,t1;
create table t1(
id int primary key,