Merge lp:~laurynas-biveinis/percona-server/bug951588-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge bug 951588 fix from 5.1.
http://jenkins.percona.com/job/percona-server-5.5-param/421/
Issue 23438.

Changes from the previous 5.5 MP:
- 5.5.25 in trunk merged
- Adjust ha_innobase::clone() method not to assert that cloned handler
user_thd and prebuilt->trx are identical to original. This check is a
violation of handler::clone() contract that is supposed to create a
new handler not sharing the old one's state.

[Alexey Kopytov (akopytov)]

Same comments as in https://code.launchpad.net/~laurynas-biveinis/percona-server/bug951588-5.1/+merge/108861

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_bug_951588.result'
--- Percona-Server/mysql-test/suite/innodb/r/percona_bug_951588.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/r/percona_bug_951588.result	2012-06-08 04:01:22 +0000
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS t1;
+CREATE TEMPORARY TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+SET DEBUG_SYNC= 'start_ha_write_row SIGNAL write_in_progress WAIT_FOR i_s_completed';
+ALTER TABLE t1 ADD COLUMN b VARCHAR(10);
+SET DEBUG_SYNC= 'now WAIT_FOR write_in_progress';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES;
+COUNT(*)
+2
+SET DEBUG_SYNC= 'now SIGNAL i_s_completed';
+DROP TABLE t1;
+SET DEBUG_SYNC='reset';

=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test'
--- Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/suite/innodb/t/percona_bug_951588.test	2012-06-08 04:01:22 +0000
@@ -0,0 +1,29 @@
+# Test for bug 951588 (Querying I_S.TEMPORARY_TABLES crashes parallel threads working on temp tables)
+
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TEMPORARY TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (3);
+
+SET DEBUG_SYNC= 'start_ha_write_row SIGNAL write_in_progress WAIT_FOR i_s_completed';
+send ALTER TABLE t1 ADD COLUMN b VARCHAR(10);
+
+connect (conn2,localhost,root,,);
+connection conn2;
+
+SET DEBUG_SYNC= 'now WAIT_FOR write_in_progress';
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_TEMPORARY_TABLES;
+SET DEBUG_SYNC= 'now SIGNAL i_s_completed';
+
+disconnect conn2;
+connection default;
+reap;
+
+DROP TABLE t1;
+
+SET DEBUG_SYNC='reset';

=== modified file 'Percona-Server/sql/handler.cc'
--- Percona-Server/sql/handler.cc	2012-05-18 04:37:44 +0000
+++ Percona-Server/sql/handler.cc	2012-06-08 04:01:22 +0000
@@ -5315,6 +5315,7 @@
   int error;
   Log_func *log_func= Write_rows_log_event::binlog_row_logging_function;
   DBUG_ENTER("handler::ha_write_row");
+  DEBUG_SYNC(ha_thd(), "start_ha_write_row");
 
   MYSQL_INSERT_ROW_START(table_share->db.str, table_share->table_name.str);
   mark_trx_read_write();

=== modified file 'Percona-Server/sql/sql_show.cc'
--- Percona-Server/sql/sql_show.cc	2012-06-05 10:36:15 +0000
+++ Percona-Server/sql/sql_show.cc	2012-06-08 04:01:22 +0000
@@ -3728,8 +3728,9 @@
     DBUG_RETURN(schema_table_store_record(thd, table));
 
   //engine
-  handler *handle= tmp_table->file;
-  char *engineType = (char *)(handle ? handle->table_type() : "UNKNOWN");
+  handler *file= tmp_table->file;
+  // Assume that invoking handler::table_type() on a shared handler is safe
+  const char *engineType = (file) ? file->table_type() : "UNKNOWN";
   table->field[3]->store(engineType, strlen(engineType), cs);
 
   //name
@@ -3740,12 +3741,15 @@
   }
 
   // file stats
-  handler *file= tmp_table->file;
-
   if (file) {
 
     MYSQL_TIME time;
 
+    /* We have only one handler object for a temp table globally and it might
+    be in use by other thread.  Do not trash it by invoking handler methods on
+    it but rather clone it. */
+    file = file->clone(tmp_table->s->normalized_path.str, thd->mem_root);
+
     /**
         TODO: InnoDB stat(file) checks file on short names within data dictionary
         rather than using full path, because of that, temp files created in
@@ -3775,6 +3779,8 @@
       table->field[10]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
       table->field[10]->set_notnull();
     }
+
+    file->close();
   }
 
   DBUG_RETURN(schema_table_store_record(thd, table));

=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-06-05 10:36:15 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2012-06-08 04:01:22 +0000
@@ -4821,10 +4821,6 @@
 	new_handler = static_cast<ha_innobase*>(handler::clone(name,
 							       mem_root));
 	if (new_handler) {
-		DBUG_ASSERT(new_handler->prebuilt != NULL);
-		DBUG_ASSERT(new_handler->user_thd == user_thd);
-		DBUG_ASSERT(new_handler->prebuilt->trx == prebuilt->trx);
-
 		new_handler->prebuilt->select_lock_type
 			= prebuilt->select_lock_type;
 	}