Bug #21462732 MYSQLPUMP --DEFER-TABLE-INDEXES MISHANDLES IN SPECIFIC CONDITION

With --defer-table-indexes option in mysqlpump, mysqlpump would parse the
SHOW CREATE TABLE output and extract indexes and constraints so that they are applied
on table after rows are dumped. This parsing of the table DDL had a problem because of
which there was a syntax error during restore of dump file. This patch fixed this
parsing issue.

Author: Bharathy Satish

client/dump/table.cc

@@ -33,6 +33,7 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
 {
   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,
@@ -57,12 +58,13 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
     }
     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)
+      if (pk_present || constraint_present)
       {
         if ((it+1) == definition_lines.end())
         {

mysql-test/r/mysqlpump_basic.result

@@ -53,6 +53,10 @@ PRIMARY KEY (p_id),
 KEY fk_t8 (c_id),
 CONSTRAINT t10_ibfk_1 FOREIGN KEY (c_id) REFERENCES t8 (c_id) ON UPDATE CASCADE
 );
+CREATE TABLE t11 (
+num int PRIMARY KEY,
+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;
@@ -100,6 +104,7 @@ WHERE TABLE_SCHEMA='db1_basic' AND TABLE_TYPE= 'BASE TABLE'
 TABLE_NAME
 t1
 t10
+t11
 t2
 t3
 t4
@@ -144,6 +149,7 @@ WHERE TABLE_SCHEMA='db1_basic' AND TABLE_TYPE= 'BASE TABLE'
 TABLE_NAME
 t1
 t10
+t11
 t2
 t3
 t4

mysql-test/t/mysqlpump_basic.test

@@ -69,10 +69,16 @@ CREATE TABLE t10 (
   CONSTRAINT t10_ibfk_1 FOREIGN KEY (c_id) REFERENCES t8 (c_id) ON UPDATE CASCADE
 );
 
+CREATE TABLE t11 (
+   num int PRIMARY KEY,
+   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;
 
+
 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');