5 files changed, 19 insertions, 11 deletions
diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result
index 3b0688fc70e..771e22b3155 100644
--- a/mysql-test/main/func_regexp_pcre.result
+++ b/mysql-test/main/func_regexp_pcre.result
@@ -526,31 +526,35 @@ c
 b
 SELECT REGEXP_REPLACE('a\rb','(*LF)(?m)^a$','c');
 REGEXP_REPLACE('a\rb','(*LF)(?m)^a$','c')
-a
-b
+a
+b
 SELECT REGEXP_REPLACE('a\rb','(*CR)(?m)^a$','c');
 REGEXP_REPLACE('a\rb','(*CR)(?m)^a$','c')
-c
-b
+c
+b
 SELECT REGEXP_REPLACE('a\rb','(*CRLF)(?m)^a$','c');
 REGEXP_REPLACE('a\rb','(*CRLF)(?m)^a$','c')
-a
-b
+a
+b
 SELECT REGEXP_REPLACE('a\rb','(*ANYCRLF)(?m)^a$','c');
 REGEXP_REPLACE('a\rb','(*ANYCRLF)(?m)^a$','c')
-c
-b
+c
+b
 SELECT REGEXP_REPLACE('a\r\nb','(*LF)(?m)^a$','c');
 REGEXP_REPLACE('a\r\nb','(*LF)(?m)^a$','c')
-a
+a
 b
 SELECT REGEXP_REPLACE('a\r\nb','(*CR)(?m)^a$','c');
 REGEXP_REPLACE('a\r\nb','(*CR)(?m)^a$','c')
-c
+c
 b
 SELECT REGEXP_REPLACE('a\r\nb','(*CRLF)(?m)^a$','c');
 REGEXP_REPLACE('a\r\nb','(*CRLF)(?m)^a$','c')
-c
+c
 b
 SELECT REGEXP_REPLACE('a\r\nb','(*ANYCRLF)(?m)^a$','c');
 REGEXP_REPLACE('a\r\nb','(*ANYCRLF)(?m)^a$','c')
-c
+c
 b
 SELECT REGEXP_REPLACE('aa','(a)\\g1','b');
 REGEXP_REPLACE('aa','(a)\\g1','b')
diff --git a/mysql-test/main/partition.result b/mysql-test/main/partition.result
index 373522ded40..a3c88fed373 100644
--- a/mysql-test/main/partition.result
+++ b/mysql-test/main/partition.result
@@ -303,10 +303,12 @@ create index i2 on t1 (a);
 Warnings:
 Note	1831	Duplicate index `i2`. This is deprecated and will be disallowed in a future release
 drop table t1;
+CREATE TABLE t0(a int);
 CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
 ENGINE=MyISAM
 PARTITION BY HASH (a);
 ERROR HY000: Partitioned tables do not support FOREIGN KEY
+DROP TABLE t0;
 CREATE TABLE t1 (
 pk INT NOT NULL AUTO_INCREMENT,
 PRIMARY KEY (pk)
diff --git a/mysql-test/main/partition.test b/mysql-test/main/partition.test
index 81752982959..c171c71c0ed 100644
--- a/mysql-test/main/partition.test
+++ b/mysql-test/main/partition.test
@@ -290,10 +290,12 @@ drop table t1;
 #
 # Bug#36001: Partitions: spelling and using some error messages
 #
---error ER_FEATURE_NOT_SUPPORTED_WITH_PARTITIONING
+CREATE TABLE t0(a int);
+--error ER_FOREIGN_KEY_ON_PARTITIONED
 CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
 ENGINE=MyISAM
 PARTITION BY HASH (a);
+DROP TABLE t0;
 
 #
 # Bug#40954: Crash if range search and order by.
diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result
index 293c9f54651..25c2834c513 100644
--- a/mysql-test/main/union.result
+++ b/mysql-test/main/union.result
@@ -581,7 +581,7 @@ insert into users values (1);
 insert into groups values (1);
 create table t1 (   id int not null auto_increment, primary key (id)   ,user_name text );
 create table t2 (    id int not null auto_increment, primary key (id)   ,group_name text );
-create table t3 (    id int not null auto_increment, primary key (id)   ,user_id int   ,index user_idx (user_id)   ,foreign key (user_id) references users(id)   ,group_id int   ,index group_idx (group_id)   ,foreign key (group_id) references groups(id) );
+create table t3 (    id int not null auto_increment, primary key (id)   ,user_id int   ,index user_idx (user_id)   ,foreign key (user_id) references t1(id)   ,group_id int   ,index group_idx (group_id)   ,foreign key (group_id) references t2(id) );
 insert into t1 (user_name) values ('Tester');
 insert into t2 (group_name) values ('Group A');
 insert into t2 (group_name) values ('Group B');
diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test
index 62e5c978602..5a6f37394d6 100644
--- a/mysql-test/main/union.test
+++ b/mysql-test/main/union.test
@@ -353,7 +353,7 @@ insert into users values (1);
 insert into groups values (1);
 create table t1 (   id int not null auto_increment, primary key (id)   ,user_name text );
 create table t2 (    id int not null auto_increment, primary key (id)   ,group_name text );
-create table t3 (    id int not null auto_increment, primary key (id)   ,user_id int   ,index user_idx (user_id)   ,foreign key (user_id) references users(id)   ,group_id int   ,index group_idx (group_id)   ,foreign key (group_id) references groups(id) );
+create table t3 (    id int not null auto_increment, primary key (id)   ,user_id int   ,index user_idx (user_id)   ,foreign key (user_id) references t1(id)   ,group_id int   ,index group_idx (group_id)   ,foreign key (group_id) references t2(id) );
 insert into t1 (user_name) values ('Tester');
 insert into t2 (group_name) values ('Group A');
 insert into t2 (group_name) values ('Group B');