Bug #21907297 MYSQLPUMP CREATES INCORRECT ALTER TABLE STATEMENT FOR FOREIGN KEY

During dump process mysqlpump extracts key columns from table definition
and creates an ALTER TABLE syntax. During this parsing of SHOW CREATE TABLE
output there was an problem which results in wrong syntax to be dumped, thus
causing restore to fail. This patch fixes this issue.

Author: Bharathy Satish

client/dump/table.cc

@@ -32,8 +32,6 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
   m_data_lenght(data_lenght)
 {
   using Detail::Pattern_matcher;
-  bool pk_present= false;
-  bool constraint_present= false;
 
   std::vector<std::string> definition_lines;
   boost::split(definition_lines, sql_formatted_definition,
@@ -42,6 +40,7 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
     it != definition_lines.end(); ++it)
   {
     boost::trim_left(*it);
+    boost::trim_if(*it, boost::is_any_of(","));
     // TODO: Look up INFORMATION_SCHEMA and get the table details.
     if (boost::starts_with(*it, "KEY ")
       || boost::starts_with(*it, "INDEX ")
@@ -50,28 +49,20 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
       || boost::starts_with(*it, "FULLTEXT KEY ")
       || boost::starts_with(*it, "FULLTEXT INDEX ")
       || boost::starts_with(*it, "SPATIAL KEY ")
-      || boost::starts_with(*it, "SPATIAL INDEX "))
+      || boost::starts_with(*it, "SPATIAL INDEX ")
+      || boost::starts_with(*it, "CONSTRAINT "))
     {
-      pk_present= true;
-      *it= boost::algorithm::replace_last_copy(*it, "),", ")");
-      m_indexes_sql_definition.push_back(*it);
-    }
-    else if (boost::starts_with(*it, "CONSTRAINT "))
-    {
-      constraint_present= true;
-      *it= boost::algorithm::replace_last_copy(*it, ",", "");
       m_indexes_sql_definition.push_back(*it);
     }
     else
     {
-      if (pk_present || constraint_present)
+      if ((it+1) == definition_lines.end())
       {
-        if ((it+1) == definition_lines.end())
-        {
-          std::string &sql_def = m_sql_definition_without_indexes;
-          sql_def = boost::algorithm::replace_last_copy(sql_def, ",", "");
-        }
+        std::string &sql_def = m_sql_definition_without_indexes;
+        sql_def = boost::algorithm::replace_last_copy(sql_def, ",", "");
       }
+      else if (it != definition_lines.begin())
+        *it+= ",";
       m_sql_definition_without_indexes+= *it + '\n';
     }
   }

mysql-test/r/mysqlpump_basic.result

@@ -60,6 +60,18 @@ FOREIGN KEY (num) REFERENCES t9 (v_id)
 ALTER TABLE t10 ADD COLUMN v_id INT NOT NULL AFTER c_id;
 ALTER TABLE t10 ADD FOREIGN KEY fk_t9(v_id) REFERENCES
 t9(v_id) ON DELETE NO ACTION ON UPDATE CASCADE;
+CREATE TABLE t12 (
+ID bigint NOT NULL DEFAULT '0',
+v bigint NOT NULL,
+PRIMARY KEY (ID,v)
+);
+CREATE TABLE t13 (
+ID bigint NOT NULL DEFAULT '0',
+k varchar(30) NOT NULL DEFAULT '',
+v bigint NOT NULL,
+PRIMARY KEY (ID, v, k),
+CONSTRAINT relation_tags_ibfk_1 FOREIGN KEY (ID, v) REFERENCES t12 (ID,v)
+);
 INSERT INTO t4  (name) VALUES ('disk_temptable_create_cost');
 INSERT INTO t4  (name) VALUES ('disk_temptable_row_cost');
 INSERT INTO t4  (name) VALUES ('key_compare_cost');
@@ -105,6 +117,8 @@ TABLE_NAME
 t1
 t10
 t11
+t12
+t13
 t2
 t3
 t4
@@ -150,6 +164,8 @@ TABLE_NAME
 t1
 t10
 t11
+t12
+t13
 t2
 t3
 t4

mysql-test/t/mysqlpump_basic.test

@@ -78,6 +78,19 @@ ALTER TABLE t10 ADD COLUMN v_id INT NOT NULL AFTER c_id;
 ALTER TABLE t10 ADD FOREIGN KEY fk_t9(v_id) REFERENCES
       t9(v_id) ON DELETE NO ACTION ON UPDATE CASCADE;
 
+CREATE TABLE t12 (
+  ID bigint NOT NULL DEFAULT '0',
+  v bigint NOT NULL,
+  PRIMARY KEY (ID,v)
+);
+
+CREATE TABLE t13 (
+  ID bigint NOT NULL DEFAULT '0',
+  k varchar(30) NOT NULL DEFAULT '',
+  v bigint NOT NULL,
+  PRIMARY KEY (ID, v, k),
+  CONSTRAINT relation_tags_ibfk_1 FOREIGN KEY (ID, v) REFERENCES t12 (ID,v)
+);
 
 INSERT INTO t4  (name) VALUES ('disk_temptable_create_cost');
 INSERT INTO t4  (name) VALUES ('disk_temptable_row_cost');