Merge lp:~laurynas-biveinis/percona-server/i-s-temp-tables-fixes-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

No BT or ST, but QA blocker.

Merge bug 1222709, bug 1113388, and bug 1223335 fixes from 5.1.

http://jenkins.percona.com/job/percona-server-5.5-param/857/

[Laurynas Biveinis (laurynas-biveinis)]

Same comment as for 5.1.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Same comments as in 5.1.

review: Needs Fixing

Unmerged revisions

559. By Laurynas Biveinis on 2013-09-13

Merge bug 1222709, bug 1113388, and bug 1223335 fixes from 5.1

=== modified file 'Percona-Server/sql/sql_show.cc'
--- Percona-Server/sql/sql_show.cc	2013-06-27 15:11:49 +0000
+++ Percona-Server/sql/sql_show.cc	2013-09-13 13:44:20 +0000
@@ -3692,13 +3692,20 @@
   @param[in]      table                    I_S table
   @param[in]      tmp_table                temporary table
   @param[in]      db                       database name
+  @param[in]      table_name_only          whether to return only session_id,
+                                           database, and table fields
+  @param[in]      thd_is_current_thd       whether the temp table belongs to
+                                           the current connection
 
   @return         Operation status
     @retval       0                        success
     @retval       1                        error
 */
 
-static int store_temporary_table_record(THD *thd, TABLE *table, TABLE *tmp_table, const char *db, bool table_name_only)
+static int store_temporary_table_record(THD *thd, TABLE *table,
+                                        TABLE *tmp_table, const char *db,
+                                        bool table_name_only,
+                                        bool thd_is_current_thd)
 {
   CHARSET_INFO *cs= system_charset_info;
   DBUG_ENTER("store_temporary_table_record");
@@ -3738,11 +3745,6 @@
 
     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
@@ -3750,14 +3752,33 @@
 
         The fix is to patch InnoDB to use full path
     */
-    file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_NO_LOCK);
-
-    table->field[5]->store((longlong) file->stats.records, TRUE);
-    table->field[5]->set_notnull();
-
-    table->field[6]->store((longlong) file->stats.mean_rec_length, TRUE);
-    table->field[7]->store((longlong) file->stats.data_file_length, TRUE);
-    table->field[8]->store((longlong) file->stats.index_file_length, TRUE);
+    if (thd_is_current_thd)
+      file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_NO_LOCK);
+
+    if (file->stats.records)
+    {
+      table->field[5]->store((longlong) file->stats.records, TRUE);
+      table->field[5]->set_notnull();
+    }
+
+    if (file->stats.mean_rec_length)
+    {
+      table->field[6]->store((longlong) file->stats.mean_rec_length, TRUE);
+      table->field[6]->set_notnull();
+    }
+
+    if (file->stats.data_file_length)
+    {
+      table->field[7]->store((longlong) file->stats.data_file_length, TRUE);
+      table->field[7]->set_notnull();
+    }
+
+    if (file->stats.index_file_length)
+    {
+      table->field[8]->store((longlong) file->stats.index_file_length, TRUE);
+      table->field[8]->set_notnull();
+    }
+
     if (file->stats.create_time)
     {
       thd->variables.time_zone->gmt_sec_to_TIME(&time,
@@ -3765,6 +3786,7 @@
       table->field[9]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
       table->field[9]->set_notnull();
     }
+
     if (file->stats.update_time)
     {
       thd->variables.time_zone->gmt_sec_to_TIME(&time,
@@ -3772,8 +3794,6 @@
       table->field[10]->store_time(&time, MYSQL_TIMESTAMP_DATETIME);
       table->field[10]->set_notnull();
     }
-
-    file->close();
   }
 
   DBUG_RETURN(schema_table_store_record(thd, table));
@@ -3823,17 +3843,14 @@
       }
 #endif
 
-      THD *t= tmp->in_use;
-      tmp->in_use= thd;
-
-      if (store_temporary_table_record(thd_item, tables->table, tmp, thd->lex->select_lex.db, table_names_only)) {
-        tmp->in_use= t;
+      if (store_temporary_table_record(thd_item, tables->table, tmp,
+                                       thd->lex->select_lex.db,
+                                       table_names_only, thd_item == thd)) {
         mysql_mutex_unlock(&thd_item->LOCK_temporary_tables);
         mysql_mutex_unlock(&LOCK_thread_count); 
         DBUG_RETURN(1);
       }
 
-      tmp->in_use= t;
     }
     mysql_mutex_unlock(&thd_item->LOCK_temporary_tables);
   }
@@ -3864,11 +3881,17 @@
   bool table_names_only= (thd->lex->sql_command == SQLCOM_SHOW_TEMPORARY_TABLES) ? 1 : 0;
   TABLE *tmp;
 
+  mysql_mutex_lock(&thd->LOCK_temporary_tables);
+
   for (tmp=thd->temporary_tables; tmp; tmp=tmp->next) {
-    if (store_temporary_table_record(thd, tables->table, tmp, thd->lex->select_lex.db, table_names_only)) {
+    if (store_temporary_table_record(thd, tables->table, tmp,
+                                     thd->lex->select_lex.db,
+                                     table_names_only, true)) {
+      mysql_mutex_unlock(&thd->LOCK_temporary_tables);
       DBUG_RETURN(1);
     }
   }
+  mysql_mutex_unlock(&thd->LOCK_temporary_tables);
   DBUG_RETURN(0);
 }
 
 
=== modified file 'Percona-Server/storage/innobase/handler/ha_innodb.cc'
--- Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-06 13:24:59 +0000
+++ Percona-Server/storage/innobase/handler/ha_innodb.cc	2013-09-13 13:44:20 +0000
@@ -5045,6 +5045,10 @@
 	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;
 	}