Merge lp:~sergei.glushchenko/percona-server/ps55-bug1017192 into lp:percona-server/5.5

[Sergei Glushchenko]

Fix for bug 1036506 (Server crashes in add_identifier on
concurrent ALTER TABLE and SHOW ENGINE INNODB STATUS).
This is a port of fix for MDEV-364 by Sergei Golubchik.
Fix explain_tablename() to distinguish between temporary
tables (#sql- prefix) and temporary partitions
(#TMP# suffix). Change explain_tablename() to use the
same name variant constants as sql_partition.cc does.
Add testcase which catches the moment
SHOW ENGINE INNODB STATUS outputs the list of locked
temporary partitions.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/612/

[Stewart Smith (stewart)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_bug1017192.result'
--- Percona-Server/mysql-test/r/percona_bug1017192.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1017192.result	2013-01-04 17:07:25 +0000
@@ -0,0 +1,10 @@
+SET DEBUG_SYNC='reset';
+CREATE TABLE IF NOT EXISTS t1 (`a` INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+SET DEBUG_SYNC='after_copy_data_between_tables SIGNAL run_show_innodb_status
+                   WAIT_FOR show_innodb_status_done';
+ALTER TABLE t1 PARTITION BY HASH (`a`) PARTITIONS 4 ;
+SET DEBUG_SYNC='now WAIT_FOR run_show_innodb_status';
+SHOW ENGINE INNODB STATUS;
+SET DEBUG_SYNC='now SIGNAL show_innodb_status_done';
+DROP TABLE t1;

=== added file 'Percona-Server/mysql-test/t/percona_bug1017192.test'
--- Percona-Server/mysql-test/t/percona_bug1017192.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1017192.test	2013-01-04 17:07:25 +0000
@@ -0,0 +1,40 @@
+########################################################################
+# Bug 1017192: Server crashes in add_identifier on concurrent
+#              ALTER TABLE and SHOW ENGINE INNODB STATUS
+# We run concurrent ALTER TABLE PARTITION and execute
+# SHOW ENGINE INNODB STATUS exactly at the moment when
+# temporary tables already created and locked.
+########################################################################
+
+--source include/have_partition.inc
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+SET DEBUG_SYNC='reset';
+
+CREATE TABLE IF NOT EXISTS t1 (`a` INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+
+--connect (con1,localhost,root,,)
+
+--connection default
+SET DEBUG_SYNC='after_copy_data_between_tables SIGNAL run_show_innodb_status
+                   WAIT_FOR show_innodb_status_done';
+--send ALTER TABLE t1 PARTITION BY HASH (`a`) PARTITIONS 4 
+--connection con1
+SET DEBUG_SYNC='now WAIT_FOR run_show_innodb_status';
+# We catch the moment when SHOW ENGINE INNODB STATUS should produce lines like:
+#   TABLE LOCK table `test`.`#sql-14021_2#P#p1` /* Partition `p1` */ trx id 506 lock mode IX
+#   TABLE LOCK table `test`.`#sql-14021_2#P#p2` /* Partition `p2` */ trx id 506 lock mode IX
+#   TABLE LOCK table `test`.`#sql-14021_2#P#p3` /* Partition `p3` */ trx id 506 lock mode IX
+#   TABLE LOCK table `test`.`#sql-14021_2#P#p0` /* Partition `p0` */ trx id 506 lock mode IX
+# This cause segmentation fault because of incorrect handling of table names
+# which look like `#sql-14021_2#P#p0`
+--disable_result_log
+SHOW ENGINE INNODB STATUS;
+--enable_result_log
+SET DEBUG_SYNC='now SIGNAL show_innodb_status_done';
+--connection default
+--reap
+
+DROP TABLE t1;

=== modified file 'Percona-Server/sql/sql_table.cc'
--- Percona-Server/sql/sql_table.cc	2012-10-10 20:32:32 +0000
+++ Percona-Server/sql/sql_table.cc	2013-01-04 17:07:25 +0000
@@ -171,6 +171,13 @@
   diagnostic, error etc. when it would be useful to know what a particular
   file [and directory] means. Such as SHOW ENGINE STATUS, error messages etc.
 
+  Examples:
+
+    t1#P#p1                 table t1 partition p1
+    t1#P#p1#SP#sp1          table t1 partition p1 subpartition sp1
+    t1#P#p1#SP#sp1#TMP#     table t1 partition p1 subpartition sp1 temporary
+    t1#P#p1#SP#sp1#REN#     table t1 partition p1 subpartition sp1 renamed
+
    @param      thd          Thread handle
    @param      from         Path name in my_charset_filename
                             Null terminated in my_charset_filename, normalized
@@ -209,7 +216,7 @@
   int  part_name_len= 0;
   const char *subpart_name= NULL;
   int  subpart_name_len= 0;
-  enum enum_file_name_type {NORMAL, TEMP, RENAMED} name_type= NORMAL;
+  uint name_variant= NORMAL_PART_NAME;
   const char *tmp_p;
   DBUG_ENTER("explain_filename");
   DBUG_PRINT("enter", ("from '%s'", from));
@@ -252,7 +259,6 @@
                (tmp_p[2] == 'L' || tmp_p[2] == 'l') &&
                 tmp_p[3] == '-')
       {
-        name_type= TEMP;
         tmp_p+= 4; /* sql- prefix found */
       }
       else
@@ -263,7 +269,7 @@
       if ((tmp_p[1] == 'M' || tmp_p[1] == 'm') &&
           (tmp_p[2] == 'P' || tmp_p[2] == 'p') &&
           tmp_p[3] == '#' && !tmp_p[4])
-        name_type= TEMP;
+        name_variant= TEMP_PART_NAME;
       else
         res= 3;
       tmp_p+= 4;
@@ -273,7 +279,7 @@
       if ((tmp_p[1] == 'E' || tmp_p[1] == 'e') &&
           (tmp_p[2] == 'N' || tmp_p[2] == 'n') &&
           tmp_p[3] == '#' && !tmp_p[4])
-        name_type= RENAMED;
+        name_variant= RENAMED_PART_NAME;
       else
         res= 4;
       tmp_p+= 4;
@@ -298,7 +304,7 @@
       subpart_name_len= strlen(subpart_name);
     else
       part_name_len= strlen(part_name);
-    if (name_type != NORMAL)
+    if (name_variant != NORMAL_PART_NAME)
     {
       if (subpart_name)
         subpart_name_len-= 5;
@@ -340,9 +346,9 @@
       to_p= strnmov(to_p, " ", end_p - to_p);
     else
       to_p= strnmov(to_p, ", ", end_p - to_p);
-    if (name_type != NORMAL)
+    if (name_variant != NORMAL_PART_NAME)
     {
-      if (name_type == TEMP)
+      if (name_variant == TEMP_PART_NAME)
         to_p= strnmov(to_p, ER_THD_OR_DEFAULT(thd, ER_TEMPORARY_NAME),
                       end_p - to_p);
       else
@@ -7397,6 +7403,8 @@
   free_io_cache(from);
   delete [] copy;				// This is never 0
 
+  DEBUG_SYNC(thd, "after_copy_data_between_tables");
+
   if (to->file->ha_end_bulk_insert() && error <= 0)
   {
     to->file->print_error(my_errno,MYF(0));