Merge lp:~akopytov/percona-server/bug901775-5.1 into lp:percona-server/5.1

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

Was approved previously. Had to recreate the branch to fix a stacked branch problem, so the previous MP is gone.

=== modified file 'Percona-Server/storage/innodb_plugin/dict/dict0load.c'
--- Percona-Server/storage/innodb_plugin/dict/dict0load.c	2011-11-24 02:00:40 +0000
+++ Percona-Server/storage/innodb_plugin/dict/dict0load.c	2011-12-28 08:15:30 +0000
@@ -430,7 +430,7 @@
 			object and check that the .ibd file exists. */
 
 			fil_open_single_table_tablespace(FALSE, space_id,
-							 flags, name);
+							 flags, name, NULL);
 		}
 
 		mem_free(name);
@@ -1023,7 +1023,7 @@
 			if (!fil_open_single_table_tablespace(
 				    TRUE, space,
 				    flags == DICT_TF_COMPACT ? 0 :
-				    flags & ~(~0 << DICT_TF_BITS), name)) {
+				    flags & ~(~0 << DICT_TF_BITS), name, NULL)) {
 				/* We failed to find a sensible
 				tablespace file */
 
 
=== modified file 'Percona-Server/storage/innodb_plugin/fil/fil0fil.c'
--- Percona-Server/storage/innodb_plugin/fil/fil0fil.c	2011-11-24 02:00:47 +0000
+++ Percona-Server/storage/innodb_plugin/fil/fil0fil.c	2011-12-28 08:15:30 +0000
@@ -3124,8 +3124,11 @@
 					accessing the first page of the file */
 	ulint		id,		/*!< in: space id */
 	ulint		flags,		/*!< in: tablespace flags */
-	const char*	name)		/*!< in: table name in the
+	const char*	name,		/*!< in: table name in the
 					databasename/tablename format */
+	trx_t*		trx)		/*!< in: transaction. This is only used
+					for IMPORT TABLESPACE, must be NULL
+					otherwise */
 {
 	os_file_t	file;
 	char*		filepath;
@@ -3342,6 +3345,11 @@
 			/* over write space id of all pages */
 			rec_offs_init(offsets_);
 
+			/* Unlock the data dictionary to not block queries
+			accessing other tables */
+			ut_a(trx);
+			row_mysql_unlock_data_dictionary(trx);
+
 			fprintf(stderr, "InnoDB: Progress in %%:");
 
 			for (offset = 0; offset < free_limit_bytes;
@@ -3543,6 +3551,9 @@
 
 			fprintf(stderr, " done.\n");
 
+			/* Reacquire the data dictionary lock */
+			row_mysql_lock_data_dictionary(trx);
+
 			/* update SYS_INDEXES set root page */
 			index = dict_table_get_first_index(table);
 			while (index) {
 
=== modified file 'Percona-Server/storage/innodb_plugin/include/fil0fil.h'
--- Percona-Server/storage/innodb_plugin/include/fil0fil.h	2011-11-24 02:00:41 +0000
+++ Percona-Server/storage/innodb_plugin/include/fil0fil.h	2011-12-28 08:15:30 +0000
@@ -473,8 +473,11 @@
 					accessing the first page of the file */
 	ulint		id,		/*!< in: space id */
 	ulint		flags,		/*!< in: tablespace flags */
-	const char*	name);		/*!< in: table name in the
+	const char*	name,		/*!< in: table name in the
 					databasename/tablename format */
+	trx_t*		trx);		/*!< in: transaction. This is only
+					used for IMPORT TABLESPACE, must be NULL
+					otherwise */
 /********************************************************************//**
 It is possible, though very improbable, that the lsn's in the tablespace to be
 imported have risen above the current system lsn, if a lengthy purge, ibuf
 
=== modified file 'Percona-Server/storage/innodb_plugin/row/row0mysql.c'
--- Percona-Server/storage/innodb_plugin/row/row0mysql.c	2011-11-24 16:33:30 +0000
+++ Percona-Server/storage/innodb_plugin/row/row0mysql.c	2011-12-28 08:15:30 +0000
@@ -2708,7 +2708,7 @@
 	success = fil_open_single_table_tablespace(
 		TRUE, table->space,
 		table->flags == DICT_TF_COMPACT ? 0 : table->flags,
-		table->name);
+		table->name, trx);
 	if (success) {
 		table->ibd_file_missing = FALSE;
 		table->tablespace_discarded = FALSE;