Merge lp:~akopytov/percona-server/bug1233841-5.6 into lp:percona-server/5.6

[Alexey Kopytov]

Cherry-picked fix for #1233841 from
lp:~pomyks/percona-server/5.5-bug1233841 as that branch was based on a
GCA revision.

[Alexey Kopytov (akopytov)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

http://jenkins.percona.com/job/percona-server-5.6-param/413/

=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-10-23 08:48:28 +0000
+++ Percona-Server/client/mysqldump.c	2013-11-25 08:15:58 +0000
@@ -2640,11 +2640,12 @@
   const char *constr_from;
   const char *constr_to;
   LIST *keydef_node;
+  my_bool keys_processed= FALSE;
 
   strend= create_str + strlen(create_str);
 
   ptr= create_str;
-  while (*ptr)
+  while (*ptr && !keys_processed)
   {
     char *tmp, *orig_ptr, c;
 
@@ -2728,7 +2729,11 @@
     {
       char *end;
 
-      if (last_comma != NULL && *ptr != ')')
+      if (last_comma != NULL && *ptr == ')')
+      {
+        keys_processed= TRUE;
+      }
+      else if (last_comma != NULL && !keys_processed)
       {
         /*
           It's not the last line of CREATE TABLE, so we have skipped a key

=== modified file 'Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result'
--- Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result	2013-05-27 03:01:29 +0000
+++ Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result	2013-11-25 08:15:58 +0000
@@ -524,3 +524,52 @@
 
 ######################################
 DROP TABLE t1;
+CREATE TABLE `t1` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`c1` int(11) DEFAULT NULL,
+PRIMARY KEY (`id`),
+KEY `c1` (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+/*!50100 PARTITION BY HASH (id)
+PARTITIONS 2*/;
+######################################
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `t1`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t1` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `c1` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+/*!50100 PARTITION BY HASH (id)
+PARTITIONS 2 */;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `t1` WRITE;
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+ALTER TABLE `t1` ADD KEY `c1` (`c1`);
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+######################################
+DROP TABLE t1;

=== modified file 'Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test'
--- Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test	2013-03-26 04:07:47 +0000
+++ Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test	2013-11-25 08:15:58 +0000
@@ -271,5 +271,32 @@
 
 DROP TABLE t1;
 
+#############################################################################
+# Bug #1233841: mysqldump --innodb-optimize-keys produces incorrect
+#               CREATE TABLE statement for partitioned tables
+#############################################################################
+
+CREATE TABLE `t1` (
+   `id` int(11) NOT NULL AUTO_INCREMENT,
+   `c1` int(11) DEFAULT NULL,
+   PRIMARY KEY (`id`),
+   KEY `c1` (`c1`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+/*!50100 PARTITION BY HASH (id)
+PARTITIONS 2*/;
+
+--exec $MYSQL_DUMP --skip-comments --innodb-optimize-keys test t1 >$file
+
+--echo ######################################
+--cat_file $file
+--echo ######################################
+
+# Check that the resulting dump can be imported back
+
+--exec $MYSQL test < $file
+
+--remove_file $file
+
+DROP TABLE t1;
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc