branches/zip: ha_innobase::add_index(): Fix Bug #46557:

after a successful operation, read innodb_table->flags from
the newly created table object, not from the old one that was just freed.

Approved by Sunny.

ChangeLog

+2009-08-13	The InnoDB Team
+
+	* handler/handler0alter.cc:
+	Fix Bug#46657 InnoDB plugin: invalid read in index_merge_innodb test
+	On a successful CREATE INDEX, diagnostic code read the table flags
+	from a recently freed table object.  Read them from the newly
+	created object instead.
+
 2009-07-20	The InnoDB Team
 
 	* buf/buf0rea.c, handler/ha_innodb.cc, include/srv0srv.h,

handler/handler0alter.cc

@@ -864,6 +864,7 @@ error_handling:
 		indexed_table->n_mysql_handles_opened++;
 
 		error = row_merge_drop_table(trx, innodb_table);
+		innodb_table = indexed_table;
 		goto convert_error;
 
 	case DB_TOO_BIG_RECORD: