From: Mattias Jonsson
Date: October 5 2010 10:32am
Subject: bzr commit into mysql-next-mr-bugfixing branch (mattias.jonsson:3316)
List-Archive: http://lists.mysql.com/commits/119976
Message-Id: <201010051033.o952TOMr008921@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6361122049969665750=="

--===============6361122049969665750==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/mattiasj/mysql-bzr/topush-next-mr-bugfixing/ based on revid:mattias.jonsson@stripped

 3316 Mattias Jonsson	2010-10-05 [merge]
      merge

    modified:
      mysql-test/r/partition_exchange.result
      mysql-test/t/partition_exchange.test
      sql/share/errmsg-utf8.txt
      sql/sql_partition_admin.cc
=== modified file 'mysql-test/r/partition_exchange.result'
--- a/mysql-test/r/partition_exchange.result	2010-08-04 11:53:45 +0000
+++ b/mysql-test/r/partition_exchange.result	2010-08-25 14:00:02 +0000
@@ -1,3 +1,16 @@
+DROP TABLE IF EXISTS t1, t2, t3, t, tp, tsp, tmp;
+CREATE TABLE t1 (s1 INT PRIMARY KEY) engine=innodb;
+CREATE TABLE t2 (s1 INT, FOREIGN KEY (s1) REFERENCES t1 (s1)) engine=innodb;
+INSERT INTO t1 VALUES (1),(2),(3);
+INSERT INTO t2 VALUES (1),(2),(3);
+CREATE TABLE t3 (s1 INT PRIMARY KEY)
+engine=innodb
+PARTITION BY LIST (s1)
+(PARTITION p1 VALUES IN (1,2,3));
+ALTER TABLE t3 EXCHANGE PARTITION p1 WITH TABLE t1;
+ERROR HY000: Table to exchange with partition have foreign key references: 't1'
+DROP TABLE t2, t1, t3;
+# Tests for WL#4445
 CREATE TABLE t (a INT,
 b VARCHAR(55),
 PRIMARY KEY (a))

=== modified file 'mysql-test/t/partition_exchange.test'
--- a/mysql-test/t/partition_exchange.test	2010-08-04 11:53:45 +0000
+++ b/mysql-test/t/partition_exchange.test	2010-08-25 14:00:02 +0000
@@ -1,5 +1,29 @@
 --source include/have_innodb.inc
 --source include/have_partition.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2, t3, t, tp, tsp, tmp;
+--enable_warnings
+
+CREATE TABLE t1 (s1 INT PRIMARY KEY) engine=innodb;
+
+CREATE TABLE t2 (s1 INT, FOREIGN KEY (s1) REFERENCES t1 (s1)) engine=innodb;
+
+INSERT INTO t1 VALUES (1),(2),(3);
+
+INSERT INTO t2 VALUES (1),(2),(3);
+
+CREATE TABLE t3 (s1 INT PRIMARY KEY)
+  engine=innodb
+  PARTITION BY LIST (s1)
+  (PARTITION p1 VALUES IN (1,2,3));
+
+--error ER_PARTITION_EXCHANGE_FOREIGN_KEY
+ALTER TABLE t3 EXCHANGE PARTITION p1 WITH TABLE t1;
+
+DROP TABLE t2, t1, t3;
+
+--echo # Tests for WL#4445
 CREATE TABLE t (a INT,
   b VARCHAR(55),
   PRIMARY KEY (a))

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2010-09-17 11:32:06 +0000
+++ b/sql/share/errmsg-utf8.txt	2010-10-05 10:31:55 +0000
@@ -6387,6 +6387,9 @@ ER_TABLES_DIFFERENT_METADATA
 ER_ROW_DOES_NOT_MATCH_PARTITION
   eng "Found row that does not match the partition"
   swe "Hittade rad som inte passar i partitionen"
+ER_PARTITION_EXCHANGE_FOREIGN_KEY
+  eng "Table to exchange with partition have foreign key references: '%-.64s'"
+  swe "Tabellen att byta ut mot partition har foreign key referenser: '%-.64s'"
 ER_WARN_INDEX_NOT_APPLICABLE
   eng "Cannot use %-.64s access on index '%-.64s' due to type or collation conversion on field '%-.64s'"
 

=== modified file 'sql/sql_partition_admin.cc'
--- a/sql/sql_partition_admin.cc	2010-08-24 10:52:32 +0000
+++ b/sql/sql_partition_admin.cc	2010-10-05 10:31:55 +0000
@@ -145,6 +145,14 @@ static bool check_exchange_partition(TAB
              table->s->table_name.str);
     DBUG_RETURN(TRUE);
   }
+
+  /* The table cannot have foreign keys constraints or be referenced */
+  if(!table->file->can_switch_engines())
+  {
+    my_error(ER_PARTITION_EXCHANGE_FOREIGN_KEY, MYF(0),
+             table->s->table_name.str);
+    DBUG_RETURN(TRUE);
+  }
   DBUG_RETURN(FALSE);
 }
 


--===============6361122049969665750==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   z2nn0a2yiws0y4y0
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\
#   bugfixing/
# testament_sha1: 99a36088191b6405025844f00191ceca5cc0741d
# timestamp: 2010-10-05 12:33:23 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# base_revision_id: mattias.jonsson@stripped\
#   hjror0jox0sxkjo2
# 
# Begin bundle
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


--===============6361122049969665750==--