Skip to content

Commit 0cdcb5f

Browse files
committed
Re-record some results
1 parent 55bb279 commit 0cdcb5f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

mysql-test/suite/innodb/r/innodb-fk-warnings.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ show warnings;
4444
Level Code Message
4545
Warning 150 Alter table '`test`.`t2`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near ' foreign key (b) references t2(b)'.
4646
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
47-
Warning 1215 Cannot add foreign key constraint
47+
Warning 1215 Cannot add foreign key constraint for `t2`
4848
drop table t2, t1;
4949
create table t1 (f1 integer primary key) engine=innodb;
5050
alter table t1 add constraint c1 foreign key (f1) references t11(f1);
@@ -53,7 +53,7 @@ show warnings;
5353
Level Code Message
5454
Warning 150 Alter table `test`.`t1` with foreign key constraint failed. Referenced table `test`.`t11` not found in the data dictionary near ' foreign key (f1) references t11(f1)'.
5555
Error 1005 Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
56-
Warning 1215 Cannot add foreign key constraint
56+
Warning 1215 Cannot add foreign key constraint for `t1`
5757
drop table t1;
5858
create temporary table t1(a int not null primary key, b int, key(b)) engine=innodb;
5959
create temporary table t2(a int, foreign key(a) references t1(a)) engine=innodb;
@@ -83,7 +83,7 @@ show warnings;
8383
Level Code Message
8484
Warning 150 Alter table `mysqld.1`.`t1` with foreign key constraint failed. Referenced table `mysqld.1`.`t1` not found in the data dictionary near 'foreign key(b) references t1(a)'.
8585
Error 1005 Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
86-
Warning 1215 Cannot add foreign key constraint
86+
Warning 1215 Cannot add foreign key constraint for `t1`
8787
drop table t1;
8888
create table t1(a int not null primary key, b int, key(b)) engine=innodb;
8989
alter table t1 add foreign key(a,b) references t1(a);
@@ -106,7 +106,7 @@ show warnings;
106106
Level Code Message
107107
Warning 150 Alter table `test`.`t1` with foreign key constraint failed. You have defined a SET NULL condition but column 'f1' is defined as NOT NULL in ' foreign key (f1) references t1(f1) on update set null' near ' on update set null'.
108108
Error 1005 Can't create table `test`.`t1` (errno: 150 "Foreign key constraint is incorrectly formed")
109-
Warning 1215 Cannot add foreign key constraint
109+
Warning 1215 Cannot add foreign key constraint for `t1`
110110
create table t2(a int not null, foreign key(a) references t1(f1) on delete set null) engine=innodb;
111111
ERROR HY000: Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
112112
show warnings;

mysql-test/suite/innodb/r/innodb-fk.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ show warnings;
6767
Level Code Message
6868
Warning 150 Alter table `test`.`t2` with foreign key constraint failed. Referenced table `test`.`t3` not found in the data dictionary near ' FOREIGN KEY (f3) REFERENCES t3 (id) ON DELETE CASCADE'.
6969
Error 1005 Can't create table `test`.`t2` (errno: 150 "Foreign key constraint is incorrectly formed")
70-
Warning 1215 Cannot add foreign key constraint
70+
Warning 1215 Cannot add foreign key constraint for `t2`
7171
drop table t2;
7272
drop table t1;
7373
CREATE DATABASE kg_test1;

mysql-test/suite/innodb_gis/r/point_basic.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,23 +1526,23 @@ show warnings;
15261526
Level Code Message
15271527
Warning 150 Alter table '`test`.`child`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
15281528
Error 1005 Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
1529-
Warning 1215 Cannot add foreign key constraint
1529+
Warning 1215 Cannot add foreign key constraint for `child`
15301530
ALTER TABLE parent DROP INDEX idx1;
15311531
ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
15321532
Got one of the listed errors
15331533
show warnings;
15341534
Level Code Message
15351535
Warning 150 Alter table '`test`.`child`' with foreign key constraint failed. There is no index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
15361536
Error 1005 Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
1537-
Warning 1215 Cannot add foreign key constraint
1537+
Warning 1215 Cannot add foreign key constraint for `child`
15381538
ALTER TABLE child DROP INDEX idx2;
15391539
ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
15401540
Got one of the listed errors
15411541
show warnings;
15421542
Level Code Message
15431543
Warning 150 Alter table '`test`.`child`' with foreign key constraint failed. There is only prefix index in the referenced table where the referenced columns appear as the first columns near 'FOREIGN KEY(p) REFERENCES parent(p)'.
15441544
Error 1005 Can't create table `test`.`child` (errno: 150 "Foreign key constraint is incorrectly formed")
1545-
Warning 1215 Cannot add foreign key constraint
1545+
Warning 1215 Cannot add foreign key constraint for `child`
15461546
DROP TABLE child, parent;
15471547
#
15481548
# Bug#28763: Selecting geometry fields in UNION caused server crash.

0 commit comments

Comments
 (0)