summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-10-25 17:58:34 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-10-25 17:58:34 +0300
commite8d793f8709ce2beab3cff6a184e0c959f44e6b9 (patch)
treedf2a4796874a51b36c61af6658c65540891b3ec9
parent013ba71dfdd6f9d49730c1a918d1d089976faefd (diff)
downloadmariadb-git-e8d793f8709ce2beab3cff6a184e0c959f44e6b9.tar.gz
Fix results after Bug#12661768 fix.
-rw-r--r--mysql-test/suite/innodb_plugin/r/innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_plugin/r/innodb.result b/mysql-test/suite/innodb_plugin/r/innodb.result
index a550b9702bb..cdb61f3ba98 100644
--- a/mysql-test/suite/innodb_plugin/r/innodb.result
+++ b/mysql-test/suite/innodb_plugin/r/innodb.result
@@ -1313,7 +1313,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,