branches/zip: ha_innobase::add_index(): When creating the primary key

and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)

Approved by Sunny Bains over IM

ChangeLog

+2009-11-18	The InnoDB Team
+
+	* handler/handler0alter.cc:
+	Fix Bug#48782 On lock wait timeout, CREATE INDEX (creating primary key)
+	attempts DROP TABLE
+
 2009-11-17	The InnoDB Team
 
 	* handler/ha_innodb.cc, mysql-test/innodb.result,

handler/handler0alter.cc

@@ -882,7 +882,9 @@ ha_innobase::add_index(
 		/* fall through */
 	default:
 		if (new_primary) {
-			row_merge_drop_table(trx, indexed_table);
+			if (indexed_table != innodb_table) {
+				row_merge_drop_table(trx, indexed_table);
+			}
 		} else {
 			if (!dict_locked) {
 				row_mysql_lock_data_dictionary(trx);