Merge from mysql-5.1 to mysql-5.5.

31a6bcbe · Annamalai Gurusami · 79af7db5 · 7a6c449c · 31a6bcbe
Commit 31a6bcbe authored May 16, 2012 by Annamalai Gurusami
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

storage/innobase/handler/handler0alter.cc storage/innobase/handler/handler0alter.cc +4 -0

No files found.
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -708,6 +708,10 @@ ha_innobase::add_index(

 	ut_a(indexed_table == prebuilt->table);

+	if (indexed_table->tablespace_discarded) {
+		DBUG_RETURN(-1);
+	}
+
 	/* Check that index keys are sensible */
 	error = innobase_check_index_keys(key_info, num_of_keys, prebuilt->table);