Bug#26116415 TABLESPACE CLAUSE CONFUSES MYSQLPUMP

Before this fix,
mysqlpump failed to export tables using a tablespace.

The root cause is that mysqlpump parses the
result of SHOW CREATE TABLE,
and is not expecting the TABLESPACE clause.

In the following statement:
CREATE TABLE `t1` (
  `a` int(11) DEFAULT NULL
) /*!50100 TABLESPACE `mytbsp` */ ENGINE=InnoDB DEFAULT CHARSET=latin1

MYSQLPUMP was looking for ") ENGINE=" ...,
and failed to detect this line.

The fix is to relax parsing of SHOW CREATE TABLE,
so that the line:
  ) /*!50100 TABLESPACE `mytbsp` */ ENGINE=...
is also detected as the table options clause.

Author: marcalff

client/dump/table.cc

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,10 +39,14 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
   for (std::vector<std::string>::iterator it= definition_lines.begin();
     it != definition_lines.end(); ++it)
   {
+    /*
+      MAINTAINER: This code parses the output of SHOW CREATE TABLE.
+      @TODO: Instead, look up INFORMATION_SCHEMA and get the table details.
+    */
+
     boost::trim_left(*it);
     if (!engine_line_read)
       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 ")
       || boost::starts_with(*it, "UNIQUE KEY ")
@@ -57,7 +61,12 @@ Table::Table(uint64 id, const std::string& name, const std::string& schema,
     }
     else
     {
-      if (boost::starts_with(*it, ") ENGINE="))
+      /*
+        Make sure we detect the table options clauses,
+        even with different syntaxes (with or without TABLESPACE)
+      */
+      if (boost::starts_with(*it, ")") &&
+          boost::contains(*it, "ENGINE="))
       {
         engine_line_read= true;
         std::string &sql_def = m_sql_definition_without_indexes;

mysql-test/r/mysqlpump_basic.result

@@ -718,3 +718,21 @@ INSERT INTO t VALUES (9), (0);
 DROP DATABASE bug26694675;
 check for warnings
 Pattern "mysqlpump: \[WARNING\]" not found
+#
+# Bug#26116415 TABLESPACE CLAUSE CONFUSES MYSQLPUMP
+#
+CREATE TABLESPACE `mytbsp` ADD DATAFILE 'mytbsp.ibd' ENGINE INNODB;
+CREATE TABLE `test`.`t1` (a integer) TABLESPACE `mytbsp`;
+SHOW CREATE TABLE test.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) /*!50100 TABLESPACE `mytbsp` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE `test`.`t1`;
+SHOW CREATE TABLE test.t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) /*!50100 TABLESPACE `mytbsp` */ ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE `test`.`t1`;
+DROP TABLESPACE `mytbsp`;

mysql-test/t/mysqlpump_basic.test

@@ -643,3 +643,27 @@ let SEARCH_PATTERN= mysqlpump: \[WARNING\];
 # cleanup
 --remove_file $MYSQLTEST_VARDIR/log/err.log
 --remove_file $MYSQLTEST_VARDIR/tmp/bug26694675.sql
+
+-- echo #
+-- echo # Bug#26116415 TABLESPACE CLAUSE CONFUSES MYSQLPUMP
+-- echo #
+
+CREATE TABLESPACE `mytbsp` ADD DATAFILE 'mytbsp.ibd' ENGINE INNODB;
+
+CREATE TABLE `test`.`t1` (a integer) TABLESPACE `mytbsp`;
+
+SHOW CREATE TABLE test.t1;
+
+--let $program= $MYSQL_PUMP --include-databases=test --include-tables=t1
+
+--exec $PROGRAM >> $MYSQL_TMP_DIR/mysqlpump.sql
+
+DROP TABLE `test`.`t1`;
+
+--exec $MYSQL < $MYSQL_TMP_DIR/mysqlpump.sql
+
+SHOW CREATE TABLE test.t1;
+
+DROP TABLE `test`.`t1`;
+DROP TABLESPACE `mytbsp`;
+